diff options
| author | Thomas Raivio <tjraivio@cc.hut.fi> | 2004-04-09 13:13:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-04-09 13:13:24 +0000 |
| commit | 2768b0d99f8a15f1a066db60a15d30b8b8130b43 (patch) | |
| tree | 6b20ade9901c2a66f9fe32f1df2fb2fe856af77f | |
| parent | 1c24c51dec049886e1ff447a94c4b5e541592396 (diff) | |
| download | ffmpeg-2768b0d99f8a15f1a066db60a15d30b8b8130b43.tar.gz | |
correctly identify AAC audio in mov/mp4/etc. files. patch by ("Thomas Raivio" <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2984 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/mov.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 30378f22f4..4de976ac08 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -995,6 +995,32 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom) size-=(16); url_fskip(pb, size); /* The mp4s atom also contians a esds atom that we can skip*/ } + else if( st->codec.codec_tag == MKTAG( 'm', 'p', '4', 'a' )) + { + /* Handle mp4 audio tag */ + get_be32(pb); /* version */ + get_be32(pb); + st->codec.channels = get_be16(pb); /* channels */ + st->codec.bits_per_sample = get_be16(pb); /* bits per sample */ + get_be32(pb); + st->codec.sample_rate = get_be16(pb); /* sample rate, not always correct */ + get_be16(pb); + c->mp4=1; + MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) }; + mov_read_default(c, pb, a); + /* Get correct sample rate from extradata */ + if(st->codec.extradata_size) { + const int samplerate_table[] = { + 96000, 88200, 64000, 48000, 44100, 32000, + 24000, 22050, 16000, 12000, 11025, 8000, + 7350, 0, 0, 0 + }; + unsigned char *px = st->codec.extradata; + // 5 bits objectTypeIndex, 4 bits sampleRateIndex, 4 bits channels + int samplerate_index = ((px[0] & 7) << 1) + ((px[1] >> 7) & 1); + st->codec.sample_rate = samplerate_table[samplerate_index]; + } + } else if(size>=(16+20)) {//16 bytes read, reading atleast 20 more #ifdef DEBUG |