|
|
|
@ -735,8 +735,8 @@ static void ac3_upmix_delay(AC3DecodeContext *s) |
|
|
|
|
static void decode_band_structure(GetBitContext *gbc, int blk, int eac3, |
|
|
|
|
int ecpl, int start_subband, int end_subband, |
|
|
|
|
const uint8_t *default_band_struct, |
|
|
|
|
uint8_t *band_struct, |
|
|
|
|
int *num_bands, uint8_t *band_sizes) |
|
|
|
|
uint8_t *band_struct, int *num_bands, |
|
|
|
|
uint8_t *band_sizes) |
|
|
|
|
{ |
|
|
|
|
int subbnd, bnd, n_subbands, n_bands=0; |
|
|
|
|
uint8_t bnd_sz[22]; |
|
|
|
@ -880,11 +880,10 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) |
|
|
|
|
s->start_freq[CPL_CH] = cpl_start_subband * 12 + 37; |
|
|
|
|
s->end_freq[CPL_CH] = cpl_end_subband * 12 + 37; |
|
|
|
|
|
|
|
|
|
decode_band_structure(gbc, blk, s->eac3, 0, |
|
|
|
|
cpl_start_subband, cpl_end_subband, |
|
|
|
|
decode_band_structure(gbc, blk, s->eac3, 0, cpl_start_subband, |
|
|
|
|
cpl_end_subband, |
|
|
|
|
ff_eac3_default_cpl_band_struct, |
|
|
|
|
s->cpl_band_struct, |
|
|
|
|
&s->num_cpl_bands, NULL); |
|
|
|
|
s->cpl_band_struct, &s->num_cpl_bands, NULL); |
|
|
|
|
} else { |
|
|
|
|
/* coupling not in use */ |
|
|
|
|
for (ch = 1; ch <= fbw_channels; ch++) { |
|
|
|
|