[FFmpeg-cvslog] r23218 - in branches/0.6: . libavcodec/aacenc.c

[siretart]

Author: siretart
Date: Fri May 21 20:27:16 2010
New Revision: 23218

Log:
Set cur_channel in the AAC encoder context where needed.

Most coder functions read it. Carting this around in the context may be
suboptimal; a refactor should be considered.


backport r23094 by alexc

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavcodec/aacenc.c

Modified: branches/0.6/libavcodec/aacenc.c
==============================================================================
--- branches/0.6/libavcodec/aacenc.c	Fri May 21 20:25:46 2010	(r23217)
+++ branches/0.6/libavcodec/aacenc.c	Fri May 21 20:27:16 2010	(r23218)
@@ -561,6 +561,7 @@ static int aac_encode_frame(AVCodecConte
             chans    = tag == TYPE_CPE ? 2 : 1;
             cpe      = &s->cpe[i];
             for (j = 0; j < chans; j++) {
+                s->cur_channel = start_ch + j;
                 s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
             }
             cpe->common_window = 0;
@@ -576,6 +577,7 @@ static int aac_encode_frame(AVCodecConte
                     }
                 }
             }
+            s->cur_channel = start_ch;
             if (cpe->common_window && s->coder->search_for_ms)
                 s->coder->search_for_ms(s, cpe, s->lambda);
             adjust_frame_information(s, cpe, chans);