From 9243ed3f91f2dc9cb9b851740bfe65836462c81f Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 29 Aug 2010 21:28:51 +0000 Subject: move h264 demuxer to its own file Originally committed as revision 24978 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 2 +- libavformat/h264dec.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/raw.c | 61 --------------------------------------- 3 files changed, 81 insertions(+), 62 deletions(-) create mode 100644 libavformat/h264dec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 401098e..dc6df29 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -89,7 +89,7 @@ OBJS-$(CONFIG_H261_DEMUXER) += raw.o OBJS-$(CONFIG_H261_MUXER) += raw.o OBJS-$(CONFIG_H263_DEMUXER) += raw.o OBJS-$(CONFIG_H263_MUXER) += raw.o -OBJS-$(CONFIG_H264_DEMUXER) += raw.o +OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o raw.o OBJS-$(CONFIG_H264_MUXER) += raw.o OBJS-$(CONFIG_IDCIN_DEMUXER) += idcin.o OBJS-$(CONFIG_IFF_DEMUXER) += iff.o diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c new file mode 100644 index 0000000..96ffb08 --- /dev/null +++ b/libavformat/h264dec.c @@ -0,0 +1,80 @@ +/* + * RAW H.264 video demuxer + * Copyright (c) 2008 Michael Niedermayer + * + * 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 "raw.h" + +static int h264_probe(AVProbeData *p) +{ + uint32_t code= -1; + int sps=0, pps=0, idr=0, res=0, sli=0; + int i; + + for(i=0; ibuf_size; i++){ + code = (code<<8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + int ref_idc= (code>>5)&3; + int type = code & 0x1F; + static const int8_t ref_zero[32]={ + 2, 0, 0, 0, 0,-1, 1,-1, + -1, 1, 1, 1, 1,-1, 2, 2, + 2, 2, 2, 0, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2 + }; + + if(code & 0x80) //forbidden bit + return 0; + + if(ref_zero[type] == 1 && ref_idc) + return 0; + if(ref_zero[type] ==-1 && !ref_idc) + return 0; + if(ref_zero[type] == 2) + res++; + + switch(type){ + case 1: sli++; break; + case 5: idr++; break; + case 7: + if(p->buf[i+2]&0x0F) + return 0; + sps++; + break; + case 8: pps++; break; + } + } + } + if(sps && pps && (idr||sli>3) && res<(sps+pps+idr)) + return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg + return 0; +} + +AVInputFormat h264_demuxer = { + "h264", + NULL_IF_CONFIG_SMALL("raw H.264 video format"), + 0, + h264_probe, + ff_raw_video_read_header, + ff_raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe + .value = CODEC_ID_H264, +}; diff --git a/libavformat/raw.c b/libavformat/raw.c index 3c59277..4261a6c 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -241,53 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s, } #endif -#if CONFIG_H264_DEMUXER -static int h264_probe(AVProbeData *p) -{ - uint32_t code= -1; - int sps=0, pps=0, idr=0, res=0, sli=0; - int i; - - for(i=0; ibuf_size; i++){ - code = (code<<8) + p->buf[i]; - if ((code & 0xffffff00) == 0x100) { - int ref_idc= (code>>5)&3; - int type = code & 0x1F; - static const int8_t ref_zero[32]={ - 2, 0, 0, 0, 0,-1, 1,-1, - -1, 1, 1, 1, 1,-1, 2, 2, - 2, 2, 2, 0, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2 - }; - - if(code & 0x80) //forbidden bit - return 0; - - if(ref_zero[type] == 1 && ref_idc) - return 0; - if(ref_zero[type] ==-1 && !ref_idc) - return 0; - if(ref_zero[type] == 2) - res++; - - switch(type){ - case 1: sli++; break; - case 5: idr++; break; - case 7: - if(p->buf[i+2]&0x0F) - return 0; - sps++; - break; - case 8: pps++; break; - } - } - } - if(sps && pps && (idr||sli>3) && res<(sps+pps+idr)) - return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg - return 0; -} -#endif - #if CONFIG_H263_DEMUXER static int h263_probe(AVProbeData *p) { @@ -662,20 +615,6 @@ AVOutputFormat h263_muxer = { }; #endif -#if CONFIG_H264_DEMUXER -AVInputFormat h264_demuxer = { - "h264", - NULL_IF_CONFIG_SMALL("raw H.264 video format"), - 0, - h264_probe, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe - .value = CODEC_ID_H264, -}; -#endif - #if CONFIG_H264_MUXER AVOutputFormat h264_muxer = { "h264", -- cgit v1.1