virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

aacenc: Fix number of coefficients used in a LFE channel.

Browse Source 
The spec states:

 *  Only the lowest 12 spectral coefficients of any LFE may be non-zero

We were using the 12 lowest *bands*.
This commit is contained in:
Nathan Caldwell 2011-07-29 14:49:04 -06:00 committed by Alex Converse
parent 51a1d4d94a
commit 24efdea7fd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aacenc.c
View File

@ -540,6 +540,12 @@ static int aac_encode_frame(AVCodecContext *avctx,
wi[ch].window_shape = 0; wi[ch].window_shape = 0;
wi[ch].num_windows = 1; wi[ch].num_windows = 1;
wi[ch].grouping[0] = 1; wi[ch].grouping[0] = 1;
/* Only the lowest 12 coefficients are used in a LFE channel.
* The expression below results in only the bottom 8 coefficients
* being used for 11.025kHz to 16kHz sample rates.
*/
ics->num_swb = s->samplerate_index >= 8 ? 1 : 3;
} else { } else {
wi[ch] = s->psy.model->window(&s->psy, samples2, la, cur_channel, wi[ch] = s->psy.model->window(&s->psy, samples2, la, cur_channel,
ics->window_sequence[0]); ics->window_sequence[0]);
@ -550,7 +556,7 @@ static int aac_encode_frame(AVCodecContext *avctx,
ics->use_kb_window[0] = wi[ch].window_shape; ics->use_kb_window[0] = wi[ch].window_shape;
ics->num_windows = wi[ch].num_windows; ics->num_windows = wi[ch].num_windows;
ics->swb_sizes = s->psy.bands [ics->num_windows == 8]; ics->swb_sizes = s->psy.bands [ics->num_windows == 8];
ics->num_swb = tag == TYPE_LFE ? 12 : s->psy.num_bands[ics->num_windows == 8]; ics->num_swb = tag == TYPE_LFE ? ics->num_swb : s->psy.num_bands[ics->num_windows == 8];
for (w = 0; w < ics->num_windows; w++) for (w = 0; w < ics->num_windows; w++)
ics->group_len[w] = wi[ch].grouping[w]; ics->group_len[w] = wi[ch].grouping[w];