virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Add support for id3 tag parsing for ADTS AAC streams

Browse Source 
Patch by Patrick Dehne ( patrick mysonicweb com )

Originally committed as revision 19225 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Patrick Dehne 2009-06-19 14:36:47 +00:00 committed by Robert Swain
parent 50fcd5be36
commit d52b90bdb4
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/raw.c
View File

@ -27,6 +27,7 @@
#include "avformat.h" #include "avformat.h"
#include "raw.h" #include "raw.h"
#include "id3v2.h" #include "id3v2.h"
#include "id3v1.h"
/* simple formats */ /* simple formats */
@ -625,6 +626,26 @@ static int adts_aac_probe(AVProbeData *p)
else if(max_frames>=1) return 1; else if(max_frames>=1) return 1;
else return 0; 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 = CODEC_TYPE_AUDIO;
st->codec->codec_id = s->iformat->value;
st->need_parsing = AVSTREAM_PARSE_FULL;
ff_id3v1_read(s);
ff_id3v2_read(s);
return 0;
}
#endif #endif
/* Note: Do not forget to add new entries to the Makefile as well. */ /* Note: Do not forget to add new entries to the Makefile as well. */
@ -635,7 +656,7 @@ AVInputFormat aac_demuxer = {
NULL_IF_CONFIG_SMALL("raw ADTS AAC"), NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
0, 0,
adts_aac_probe, adts_aac_probe,
audio_read_header, adts_aac_read_header,
ff_raw_read_partial_packet, ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags= AVFMT_GENERIC_INDEX,
.extensions = "aac", .extensions = "aac",