diff options
| author | Dirk Farin <dirk.farin@gmail.com> | 2013-09-02 14:33:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 19:34:04 +0200 |
| commit | 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 (patch) | |
| tree | 0dc192452ab17e725c16fb40cad7107dccc91ded /libavformat | |
| parent | 771e2e59e2afeba6f195645678645b8c874e59a2 (diff) | |
| download | ffmpeg-902a5fa7228d92bf7e0a8f523a25cf72d31afab4.tar.gz | |
avformat: H265 demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/h265dec.c | 60 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
4 files changed, 63 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 35d49f7302..ceffa783a7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,6 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o +OBJS-$(CONFIG_H265_DEMUXER) += h265dec.o rawdec.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index b3b2a3bba5..03c883bc8e 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -135,6 +135,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(H261, h261); REGISTER_MUXDEMUX(H263, h263); REGISTER_MUXDEMUX(H264, h264); + REGISTER_DEMUXER (H265, h265); REGISTER_MUXDEMUX(HLS, hls); REGISTER_MUXDEMUX(ICO, ico); REGISTER_DEMUXER (IDCIN, idcin); diff --git a/libavformat/h265dec.c b/libavformat/h265dec.c new file mode 100644 index 0000000000..1eb8402d86 --- /dev/null +++ b/libavformat/h265dec.c @@ -0,0 +1,60 @@ +/* + * RAW H.265 video demuxer + * Copyright (c) 2013 Dirk Farin <dirk.farin@gmail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "rawdec.h" + +static int h265_probe(AVProbeData *p) +{ + uint32_t code= -1; + int vps=0, sps=0, pps=0, idr=0; + int i; + + for(i=0; i<p->buf_size-1; i++){ + code = (code<<8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + uint8_t nal2 = p->buf[i+1]; + int type = (code & 0x7E)>>1; + + if (code & 0x81) // forbidden and reserved zero bits + return 0; + + if (nal2 & 0xf8) // reserved zero + return 0; + + switch (type) { + case 32: vps++; break; + case 33: sps++; break; + case 34: pps++; break; + case 19: + case 20: idr++; break; + } + } + } + + // printf("vps=%d, sps=%d, pps=%d, idr=%d\n", vps, sps, pps, idr); + + if (vps && sps && pps && idr) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + return 0; +} + +FF_DEF_RAWVIDEO_DEMUXER(h265 , "raw H.265 video", h265_probe, "h265,265,hevc", AV_CODEC_ID_H265) diff --git a/libavformat/version.h b/libavformat/version.h index d735f9d81d..47a022b822 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 15 +#define LIBAVFORMAT_VERSION_MINOR 16 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |