generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aacenc: Adjust array offsets for the current channel before calling ff_psy_suggest_window().

Browse Source 
Patch by Nathan Caldwell <saintdev@gmail.com>

Originally committed as revision 24332 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nathan Caldwell
2010-07-19 18:22:44 +00:00
committed by Alex Converse
parent 0045499dec
commit 2bb1d0e77a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/aacenc.c
View File

@@ -517,20 +517,21 @@ static int aac_encode_frame(AVCodecContext *avctx,
tag = chan_map[i+1]; tag = chan_map[i+1];
chans = tag == TYPE_CPE ? 2 : 1; chans = tag == TYPE_CPE ? 2 : 1;
cpe = &s->cpe[i]; cpe = &s->cpe[i];
samples2 = samples + start_ch;
la = samples2 + (448+64) * avctx->channels + start_ch;
if (!data)
la = NULL;
for (j = 0; j < chans; j++) { for (j = 0; j < chans; j++) {
IndividualChannelStream *ics = &cpe->ch[j].ics; IndividualChannelStream *ics = &cpe->ch[j].ics;
int k; int k;
int cur_channel = start_ch + j;
samples2 = samples + cur_channel;
la = samples2 + (448+64) * avctx->channels;
if (!data)
la = NULL;
if (tag == TYPE_LFE) { if (tag == TYPE_LFE) {
wi[j].window_type[0] = ONLY_LONG_SEQUENCE; wi[j].window_type[0] = ONLY_LONG_SEQUENCE;
wi[j].window_shape = 0; wi[j].window_shape = 0;
wi[j].num_windows = 1; wi[j].num_windows = 1;
wi[j].grouping[0] = 1; wi[j].grouping[0] = 1;
} else { } else {
wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j, wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, cur_channel,
ics->window_sequence[0]); ics->window_sequence[0]);
} }
ics->window_sequence[1] = ics->window_sequence[0]; ics->window_sequence[1] = ics->window_sequence[0];
@@ -543,8 +544,8 @@ static int aac_encode_frame(AVCodecContext *avctx,
for (k = 0; k < ics->num_windows; k++) for (k = 0; k < ics->num_windows; k++)
ics->group_len[k] = wi[j].grouping[k]; ics->group_len[k] = wi[j].grouping[k];
s->cur_channel = start_ch + j; s->cur_channel = cur_channel;
apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2 + j); apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2);
} }
start_ch += chans; start_ch += chans;
} }