From c3ed4b2d38047153d992dee13b50148482aaaf6e Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 29 Aug 2010 21:14:55 +0000 Subject: move cavsvideo demuxer to its own file Originally committed as revision 24975 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/raw.c | 58 ------------------------------------------------------- 1 file changed, 58 deletions(-) (limited to 'libavformat/raw.c') diff --git a/libavformat/raw.c b/libavformat/raw.c index 5cf16d3..33c6cdc 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", -- cgit v1.1