Changeset e41cd3cd in ffmpeg


Ignore:
Timestamp:
May 12, 2013, 5:14:17 PM (12 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
e1746d05
Parents:
91f4a44f
git-author:
Claudio Freire <klaussfreire@gmail.com> (05/12/13 07:38:40)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/12/13 17:14:17)
Message:

aacenc: Fix ticket #1784: erasure of surround channels

This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Test sample attached on the bug tracker had the peculiar case of all
other channels being silent, so the error was far more noticeable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libavcodec/aacenc.c

    r91f4a44f re41cd3cd  
    594594            s->psy.model->analyze(&s->psy, start_ch, coeffs, wi);
    595595            for (ch = 0; ch < chans; ch++) {
    596                 s->cur_channel = start_ch * 2 + ch;
     596                s->cur_channel = start_ch + ch;
    597597                s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda);
    598598            }
     
    610610                }
    611611            }
    612             s->cur_channel = start_ch * 2;
     612            s->cur_channel = start_ch;
    613613            if (s->options.stereo_mode && cpe->common_window) {
    614614                if (s->options.stereo_mode > 0) {
Note: See TracChangeset for help on using the changeset viewer.