Ticket #2686: aac-improvements-wip-v8-fix.patch

libavcodec/aaccoder.c

@@ -1456 +1456 @@
                         continue;
                     }
                     
+                    /* No CB can be zero */
+                    midcb = FFMAX(1,sce0->band_type[w*16+g]);
+                    sidcb = FFMAX(1,sce1->band_type[w*16+g]);
+                    
                     for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) {
                         FFPsyBand *band0 = &s->psy.ch[s->cur_channel+0].psy_bands[(w+w2)*16+g];
                         FFPsyBand *band1 = &s->psy.ch[s->cur_channel+1].psy_bands[(w+w2)*16+g];
@@ -1475 +1479 @@
                                                     L34,
                                                     sce0->ics.swb_sizes[g],
                                                     sce0->sf_idx[(w+w2)*16+g],
-                                                    sce0->band_type[(w+w2)*16+g],
+                                                    sce0->band_type[w*16+g],
                                                     lambda / band0->threshold, INFINITY, &b1, 0);
                         dist1 += quantize_band_cost(s, sce1->coeffs + start + w2*128,
                                                     R34,
                                                     sce1->ics.swb_sizes[g],
                                                     sce1->sf_idx[(w+w2)*16+g],
-                                                    sce1->band_type[(w+w2)*16+g],
+                                                    sce1->band_type[w*16+g],
                                                     lambda / band1->threshold, INFINITY, &b2, 0);
                         dist2 += quantize_band_cost(s, M,
                                                     M34,