int l11ptr;
} mant_groups;
-#define TRANSFORM_COEFF(tc, m, e, f) (tc) = (m) * (f)[(e)]
-
/* Get the transform coefficients for coupling channel and uncouple channels.
* The coupling transform coefficients starts at the the cplstrtmant, which is
* equal to endmant[ch] for fbw channels. Hence we can uncouple channels before
for (ch = 0; ch < ctx->nfchans; ch++)
if (((ctx->chincpl) >> ch) & 1) {
if ((ctx->dithflag >> ch) & 1) {
- TRANSFORM_COEFF(cplcoeff, av_random(&ctx->dith_state) & 0xFFFF, exps[start], scale_factors);
+ cplcoeff = (av_random(&ctx->dith_state) & 0xFFFF) * scale_factors[exps[start]];
ctx->transform_coeffs[ch + 1][start] = cplcoeff * cplcos[ch] * LEVEL_MINUS_3DB;
} else
ctx->transform_coeffs[ch + 1][start] = 0;
m->l3_quantizers[2] = l3_quantizers_3[gcode];
m->l3ptr = 0;
}
- TRANSFORM_COEFF(cplcoeff, m->l3_quantizers[m->l3ptr++], exps[start], scale_factors);
+ cplcoeff = m->l3_quantizers[m->l3ptr++] * scale_factors[exps[start]];
break;
case 2:
m->l5_quantizers[2] = l5_quantizers_3[gcode];
m->l5ptr = 0;
}
- TRANSFORM_COEFF(cplcoeff, m->l5_quantizers[m->l5ptr++], exps[start], scale_factors);
+ cplcoeff = m->l5_quantizers[m->l5ptr++] * scale_factors[exps[start]];
break;
case 3:
- TRANSFORM_COEFF(cplcoeff, l7_quantizers[get_bits(gb, 3)], exps[start], scale_factors);
+ cplcoeff = l7_quantizers[get_bits(gb, 3)] * scale_factors[exps[start]];
break;
case 4:
m->l11_quantizers[1] = l11_quantizers_2[gcode];
m->l11ptr = 0;
}
- TRANSFORM_COEFF(cplcoeff, m->l11_quantizers[m->l11ptr++], exps[start], scale_factors);
+ cplcoeff = m->l11_quantizers[m->l11ptr++] * scale_factors[exps[start]];
break;
case 5:
- TRANSFORM_COEFF(cplcoeff, l15_quantizers[get_bits(gb, 4)], exps[start], scale_factors);
+ cplcoeff = l15_quantizers[get_bits(gb, 4)] * scale_factors[exps[start]];
break;
default:
- TRANSFORM_COEFF(cplcoeff, get_sbits(gb, qntztab[tbap]) << (16 - qntztab[tbap]),
- exps[start], scale_factors);
+ cplcoeff = (get_sbits(gb, qntztab[tbap]) << (16 - qntztab[tbap])) * scale_factors[exps[start]];
}
for (ch = 0; ch < ctx->nfchans; ch++)
if ((ctx->chincpl >> ch) & 1)
continue;
}
else {
- TRANSFORM_COEFF(coeffs[i], av_random(&ctx->dith_state) & 0xFFFF, exps[i], factors);
+ coeffs[i] = (av_random(&ctx->dith_state) & 0xFFFF) * factors[exps[i]];
coeffs[i] *= LEVEL_MINUS_3DB;
continue;
}
m->l3_quantizers[2] = l3_quantizers_3[gcode];
m->l3ptr = 0;
}
- TRANSFORM_COEFF(coeffs[i], m->l3_quantizers[m->l3ptr++], exps[i], factors);
+ coeffs[i] = m->l3_quantizers[m->l3ptr++] * factors[exps[i]];
continue;
case 2:
m->l5_quantizers[2] = l5_quantizers_3[gcode];
m->l5ptr = 0;
}
- TRANSFORM_COEFF(coeffs[i], m->l5_quantizers[m->l5ptr++], exps[i], factors);
+ coeffs[i] = m->l5_quantizers[m->l5ptr++] * factors[exps[i]];
continue;
case 3:
- TRANSFORM_COEFF(coeffs[i], l7_quantizers[get_bits(gb, 3)], exps[i], factors);
+ coeffs[i] = l7_quantizers[get_bits(gb, 3)] * factors[exps[i]];
continue;
case 4:
m->l11_quantizers[1] = l11_quantizers_2[gcode];
m->l11ptr = 0;
}
- TRANSFORM_COEFF(coeffs[i], m->l11_quantizers[m->l11ptr++], exps[i], factors);
+ coeffs[i] = m->l11_quantizers[m->l11ptr++] * factors[exps[i]];
continue;
case 5:
- TRANSFORM_COEFF(coeffs[i], l15_quantizers[get_bits(gb, 4)], exps[i], factors);
+ coeffs[i] = l15_quantizers[get_bits(gb, 4)] * factors[exps[i]];
continue;
default:
- TRANSFORM_COEFF(coeffs[i], get_sbits(gb, qntztab[tbap]) << (16 - qntztab[tbap]), exps[i], factors);
+ coeffs[i] = (get_sbits(gb, qntztab[tbap]) << (16 - qntztab[tbap])) * factors[exps[i]];
continue;
}
}