RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add audio codec 0x1602 (AAC LATM) 

Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross 2011-01-09 02:11:41 +00:00
parent 14207fd23e
commit 50d83b2005
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/riff.c
View File

@ -298,6 +298,7 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ CODEC_ID_IMC, 0x0401 }, { CODEC_ID_IMC, 0x0401 },
{ CODEC_ID_GSM_MS, 0x1500 }, { CODEC_ID_GSM_MS, 0x1500 },
{ CODEC_ID_TRUESPEECH, 0x1501 }, { CODEC_ID_TRUESPEECH, 0x1501 },
{ CODEC_ID_AAC_LATM, 0x1602 },
{ CODEC_ID_AC3, 0x2000 }, { CODEC_ID_AC3, 0x2000 },
{ CODEC_ID_DTS, 0x2001 }, { CODEC_ID_DTS, 0x2001 },
{ CODEC_ID_SONIC, 0x2048 }, { CODEC_ID_SONIC, 0x2048 },
@ -515,6 +516,11 @@ void ff_get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
url_fskip(pb, size); url_fskip(pb, size);
} }
codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample); codec->codec_id = ff_wav_codec_get_id(id, codec->bits_per_coded_sample);
if (codec->codec_id == CODEC_ID_AAC_LATM) {
/* channels and sample_rate values are those prior to applying SBR and/or PS */
codec->channels = 0;
codec->sample_rate = 0;
}
} }