Author: andoma
Date: Wed Apr 2 13:30:34 2008
New Revision: 2066
Log:
Obtain sample rates from mpeg4audio.[ch]
Modified:
aac/aac.c
aac/aactab.h
Modified: aac/aac.c
==============================================================================
--- aac/aac.c (original)
+++ aac/aac.c Wed Apr 2 13:30:34 2008
@@ -654,7 +654,7 @@ static int program_config_element(AACCon
av_log(ac->avccontext, AV_LOG_ERROR, "Invalid sampling rate index
%d\n", ac->m4ac.sampling_index);
return -1;
}
- ac->m4ac.sample_rate = sampling_table[ac->m4ac.sampling_index];
+ ac->m4ac.sample_rate = ff_mpeg4audio_sample_rates[ac->m4ac.sampling_index];
num_front = get_bits(gb, 4);
num_side = get_bits(gb, 4);
num_back = get_bits(gb, 4);
Modified: aac/aactab.h
==============================================================================
--- aac/aactab.h (original)
+++ aac/aactab.h Wed Apr 2 13:30:34 2008
@@ -32,7 +32,6 @@
#define TNS_MAX_ORDER 20
-static const uint32_t sampling_table[] = { 96000, 88200, 64000, 48000, 44100,
32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350 };
static const uint32_t inv_sampling_table[] = { 92017, 75132, 55426, 46009,
37655, 27713, 23004, 18783, 13856, 11502, 9391 };
static const uint16_t swb_offset_1024_96[] = {
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
