Mercurial > libavformat.hg
changeset 6431:b36b683626e6 libavformat
move mpegvideo demuxer to its own file
| author | aurel |
|---|---|
| date | Sun, 29 Aug 2010 20:36:23 +0000 |
| parents | d3a51b32b769 |
| children | 7ae181b3ca00 |
| files | Makefile mpegvideodec.c raw.c |
| diffstat | 3 files changed, 68 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Aug 29 19:16:04 2010 +0000 +++ b/Makefile Sun Aug 29 20:36:23 2010 +0000 @@ -135,7 +135,7 @@ OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o adtsenc.o -OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o +OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += mpegvideodec.o raw.o OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpegvideodec.c Sun Aug 29 20:36:23 2010 +0000 @@ -0,0 +1,67 @@ +/* + * RAW MPEG video demuxer + * Copyright (c) 2002-2003 Fabrice Bellard + * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> + * + * 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" + +#define SEQ_START_CODE 0x000001b3 +#define GOP_START_CODE 0x000001b8 +#define PICTURE_START_CODE 0x00000100 +#define SLICE_START_CODE 0x00000101 +#define PACK_START_CODE 0x000001ba +#define VIDEO_ID 0x000001e0 +#define AUDIO_ID 0x000001c0 + +static int mpegvideo_probe(AVProbeData *p) +{ + uint32_t code= -1; + int pic=0, seq=0, slice=0, pspack=0, pes=0; + int i; + + for(i=0; i<p->buf_size; i++){ + code = (code<<8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + switch(code){ + case SEQ_START_CODE: seq++; break; + case PICTURE_START_CODE: pic++; break; + case SLICE_START_CODE: slice++; break; + case PACK_START_CODE: pspack++; break; + } + if ((code & 0x1f0) == VIDEO_ID) pes++; + else if((code & 0x1e0) == AUDIO_ID) pes++; + } + } + if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) + return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return 0; +} + +AVInputFormat mpegvideo_demuxer = { + "mpegvideo", + NULL_IF_CONFIG_SMALL("raw MPEG video"), + 0, + mpegvideo_probe, + ff_raw_video_read_header, + ff_raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .value = CODEC_ID_MPEG1VIDEO, +};
--- a/raw.c Sun Aug 29 19:16:04 2010 +0000 +++ b/raw.c Sun Aug 29 20:36:23 2010 +0000 @@ -241,40 +241,6 @@ } #endif -#if CONFIG_MPEGVIDEO_DEMUXER -#define SEQ_START_CODE 0x000001b3 -#define GOP_START_CODE 0x000001b8 -#define PICTURE_START_CODE 0x00000100 -#define SLICE_START_CODE 0x00000101 -#define PACK_START_CODE 0x000001ba -#define VIDEO_ID 0x000001e0 -#define AUDIO_ID 0x000001c0 - -static int mpegvideo_probe(AVProbeData *p) -{ - uint32_t code= -1; - int pic=0, seq=0, slice=0, pspack=0, pes=0; - int i; - - for(i=0; i<p->buf_size; i++){ - code = (code<<8) + p->buf[i]; - if ((code & 0xffffff00) == 0x100) { - switch(code){ - case SEQ_START_CODE: seq++; break; - case PICTURE_START_CODE: pic++; break; - case SLICE_START_CODE: slice++; break; - case PACK_START_CODE: pspack++; break; - } - if ((code & 0x1f0) == VIDEO_ID) pes++; - else if((code & 0x1e0) == AUDIO_ID) pes++; - } - } - if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes) - return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg - return 0; -} -#endif - #if CONFIG_CAVSVIDEO_DEMUXER #define CAVS_SEQ_START_CODE 0x000001b0 #define CAVS_PIC_I_START_CODE 0x000001b3 @@ -972,19 +938,6 @@ }; #endif -#if CONFIG_MPEGVIDEO_DEMUXER -AVInputFormat mpegvideo_demuxer = { - "mpegvideo", - NULL_IF_CONFIG_SMALL("raw MPEG video"), - 0, - mpegvideo_probe, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .value = CODEC_ID_MPEG1VIDEO, -}; -#endif - #if CONFIG_CAVSVIDEO_DEMUXER AVInputFormat cavsvideo_demuxer = { "cavsvideo",