MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config

Browse Source 
This also fixes broken SBR detection, which produced files with double
sample rate since 8ae0fa2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Anton Khirnov 2011-03-21 09:05:36 +01:00 committed by Ronald S. Bultje
parent 78e99e0f32
commit bc17bd90f5
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/matroskaenc.c
View File

@ -439,28 +439,15 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex
static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec, int *sample_rate, int *output_sample_rate)
{
int sri;
MPEG4AudioConfig mp4ac;
if (codec->extradata_size < 2) {
av_log(s, AV_LOG_WARNING, "No AAC extradata, unable to determine samplerate.\n");
if (ff_mpeg4audio_get_config(&mp4ac, codec->extradata, codec->extradata_size) < 0) {
av_log(s, AV_LOG_WARNING, "Error parsing AAC extradata, unable to determine samplerate.\n");
return;
}
sri = ((codec->extradata[0] << 1) & 0xE) | (codec->extradata[1] >> 7);
if (sri > 12) {
av_log(s, AV_LOG_WARNING, "AAC samplerate index out of bounds\n");
return;
}
*sample_rate = ff_mpeg4audio_sample_rates[sri];
// if sbr, get output sample rate as well
if (codec->extradata_size == 5) {
sri = (codec->extradata[4] >> 3) & 0xF;
if (sri > 12) {
av_log(s, AV_LOG_WARNING, "AAC output samplerate index out of bounds\n");
return;
}
*output_sample_rate = ff_mpeg4audio_sample_rates[sri];
}
*sample_rate = mp4ac.sample_rate;
*output_sample_rate = mp4ac.ext_sample_rate;
}
static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec, int native_id, int qt_id)