diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 16:18:20 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-08-29 16:18:20 +0000 |
commit | 49824cb66a329b1c30c76a1b26b176bedab9dcee (patch) | |
tree | d2425848942728a31312ee2eda2148e7891df20b /libavformat/raw.c | |
parent | ef4a93426a2ccb8caa35c3e0c6c8409fa4bd8e0e (diff) |
move ADTS AAC demuxer to its own file
Originally committed as revision 24967 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/raw.c')
-rw-r--r-- | libavformat/raw.c | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 7b46c188a1..6c97e1b7ed 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -662,81 +662,8 @@ static int eac3_probe(AVProbeData *p) } #endif -#if CONFIG_AAC_DEMUXER -static int adts_aac_probe(AVProbeData *p) -{ - int max_frames = 0, first_frames = 0; - int fsize, frames; - uint8_t *buf0 = p->buf; - uint8_t *buf2; - uint8_t *buf; - uint8_t *end = buf0 + p->buf_size - 7; - - if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { - buf0 += ff_id3v2_tag_len(buf0); - } - buf = buf0; - - for(; buf < end; buf= buf2+1) { - buf2 = buf; - - for(frames = 0; buf2 < end; frames++) { - uint32_t header = AV_RB16(buf2); - if((header&0xFFF6) != 0xFFF0) - break; - fsize = (AV_RB32(buf2+3)>>13) & 0x8FFF; - if(fsize < 7) - break; - buf2 += fsize; - } - max_frames = FFMAX(max_frames, frames); - if(buf == buf0) - first_frames= frames; - } - if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1; - else if(max_frames>500)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; - else if(max_frames>=1) return 1; - else return 0; -} - -static int adts_aac_read_header(AVFormatContext *s, - AVFormatParameters *ap) -{ - AVStream *st; - - st = av_new_stream(s, 0); - if (!st) - return AVERROR(ENOMEM); - - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = s->iformat->value; - st->need_parsing = AVSTREAM_PARSE_FULL; - - ff_id3v1_read(s); - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); - - return 0; -} - -#endif - /* Note: Do not forget to add new entries to the Makefile as well. */ -#if CONFIG_AAC_DEMUXER -AVInputFormat aac_demuxer = { - "aac", - NULL_IF_CONFIG_SMALL("raw ADTS AAC"), - 0, - adts_aac_probe, - adts_aac_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "aac", - .value = CODEC_ID_AAC, -}; -#endif - #if CONFIG_AC3_DEMUXER AVInputFormat ac3_demuxer = { "ac3", |