From c3ed4b2d38047153d992dee13b50148482aaaf6e Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 29 Aug 2010 21:14:55 +0000 Subject: [PATCH] move cavsvideo demuxer to its own file Originally committed as revision 24975 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/Makefile | 2 +- libavformat/cavsvideodec.c | 77 ++++++++++++++++++++++++++++++++++++++ libavformat/raw.c | 58 ---------------------------- 3 files changed, 78 insertions(+), 59 deletions(-) create mode 100644 libavformat/cavsvideodec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index bafa05bbb0..a61f6b8076 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -47,7 +47,7 @@ OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BINK_DEMUXER) += bink.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o -OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o +OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o raw.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c new file mode 100644 index 0000000000..937d4b671b --- /dev/null +++ b/libavformat/cavsvideodec.c @@ -0,0 +1,77 @@ +/* + * RAW Chinese AVS video demuxer + * Copyright (c) 2009 Stefan Gehrer + * + * 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 CAVS_SEQ_START_CODE 0x000001b0 +#define CAVS_PIC_I_START_CODE 0x000001b3 +#define CAVS_UNDEF_START_CODE 0x000001b4 +#define CAVS_PIC_PB_START_CODE 0x000001b6 +#define CAVS_VIDEO_EDIT_CODE 0x000001b7 +#define CAVS_PROFILE_JIZHUN 0x20 + +static int cavsvideo_probe(AVProbeData *p) +{ + uint32_t code= -1; + int pic=0, seq=0, slice_pos = 0; + int i; + + for(i=0; ibuf_size; i++){ + code = (code<<8) + p->buf[i]; + if ((code & 0xffffff00) == 0x100) { + if(code < CAVS_SEQ_START_CODE) { + /* slices have to be consecutive */ + if(code < slice_pos) + return 0; + slice_pos = code; + } else { + slice_pos = 0; + } + if (code == CAVS_SEQ_START_CODE) { + seq++; + /* check for the only currently supported profile */ + if(p->buf[i+1] != CAVS_PROFILE_JIZHUN) + return 0; + } else if ((code == CAVS_PIC_I_START_CODE) || + (code == CAVS_PIC_PB_START_CODE)) { + pic++; + } else if ((code == CAVS_UNDEF_START_CODE) || + (code > CAVS_VIDEO_EDIT_CODE)) { + return 0; + } + } + } + if(seq && seq*9<=pic*10) + return AVPROBE_SCORE_MAX/2; + return 0; +} + +AVInputFormat cavsvideo_demuxer = { + "cavsvideo", + NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), + 0, + cavsvideo_probe, + ff_raw_video_read_header, + ff_raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .value = CODEC_ID_CAVS, +}; diff --git a/libavformat/raw.c b/libavformat/raw.c index 5cf16d33a0..33c6cdcdc1 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -241,51 +241,6 @@ int ff_raw_video_read_header(AVFormatContext *s, } #endif -#if CONFIG_CAVSVIDEO_DEMUXER -#define CAVS_SEQ_START_CODE 0x000001b0 -#define CAVS_PIC_I_START_CODE 0x000001b3 -#define CAVS_UNDEF_START_CODE 0x000001b4 -#define CAVS_PIC_PB_START_CODE 0x000001b6 -#define CAVS_VIDEO_EDIT_CODE 0x000001b7 -#define CAVS_PROFILE_JIZHUN 0x20 - -static int cavsvideo_probe(AVProbeData *p) -{ - uint32_t code= -1; - int pic=0, seq=0, slice_pos = 0; - int i; - - for(i=0; ibuf_size; i++){ - code = (code<<8) + p->buf[i]; - if ((code & 0xffffff00) == 0x100) { - if(code < CAVS_SEQ_START_CODE) { - /* slices have to be consecutive */ - if(code < slice_pos) - return 0; - slice_pos = code; - } else { - slice_pos = 0; - } - if (code == CAVS_SEQ_START_CODE) { - seq++; - /* check for the only currently supported profile */ - if(p->buf[i+1] != CAVS_PROFILE_JIZHUN) - return 0; - } else if ((code == CAVS_PIC_I_START_CODE) || - (code == CAVS_PIC_PB_START_CODE)) { - pic++; - } else if ((code == CAVS_UNDEF_START_CODE) || - (code > CAVS_VIDEO_EDIT_CODE)) { - return 0; - } - } - } - if(seq && seq*9<=pic*10) - return AVPROBE_SCORE_MAX/2; - return 0; -} -#endif - #if CONFIG_M4V_DEMUXER #define VISUAL_OBJECT_START_CODE 0x000001b5 #define VOP_START_CODE 0x000001b6 @@ -938,19 +893,6 @@ AVOutputFormat mpeg2video_muxer = { }; #endif -#if CONFIG_CAVSVIDEO_DEMUXER -AVInputFormat cavsvideo_demuxer = { - "cavsvideo", - NULL_IF_CONFIG_SMALL("raw Chinese AVS video"), - 0, - cavsvideo_probe, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .value = CODEC_ID_CAVS, -}; -#endif - #if CONFIG_NULL_MUXER AVOutputFormat null_muxer = { "null",