diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-21 10:34:29 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2009-02-21 10:34:29 +0000 |
| commit | 9f2fc1268cb307da84910ac236e10b24bdda5d0a (patch) | |
| tree | a621bd6b256c32d2f6d457ad64dbaf7fdf9efde2 /libavformat | |
| parent | a169df2f76c88679297fb2bff0424cadc3b509dd (diff) | |
add raw demuxer for Chinese AVS elementary streams
Originally committed as revision 17473 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 | ||||
| -rw-r--r-- | libavformat/allformats.c | 1 | ||||
| -rw-r--r-- | libavformat/raw.c | 56 |
3 files changed, 58 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index bf6fce20e9..4dcb2d491c 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -33,6 +33,7 @@ OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o +OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o OBJS-$(CONFIG_DAUD_MUXER) += daud.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1eaab3ce99..4be6a87d7e 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -65,6 +65,7 @@ void av_register_all(void) REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid); REGISTER_DEMUXER (BFI, bfi); REGISTER_DEMUXER (C93, c93); + REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); REGISTER_MUXDEMUX (DIRAC, dirac); diff --git a/libavformat/raw.c b/libavformat/raw.c index 9ddd55fd88..ca28b57b92 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -365,6 +365,49 @@ static int mpegvideo_probe(AVProbeData *p) return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg return 0; } + +#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; i<p->buf_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 @@ -1054,6 +1097,19 @@ AVInputFormat mpegvideo_demuxer = { }; #endif +#if CONFIG_CAVSVIDEO_DEMUXER +AVInputFormat cavsvideo_demuxer = { + "cavsvideo", + NULL_IF_CONFIG_SMALL("Chinese AVS video"), + 0, + cavsvideo_probe, + video_read_header, + raw_read_partial_packet, + .flags= AVFMT_GENERIC_INDEX, + .value = CODEC_ID_CAVS, +}; +#endif + #if CONFIG_NULL_MUXER AVOutputFormat null_muxer = { "null", |