|
|
@ -640,13 +640,20 @@ static int dca_parse_frame_header(DCAContext *s) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static inline int get_scale(GetBitContext *gb, int level, int value) |
|
|
|
static inline int get_scale(GetBitContext *gb, int level, int value, int log2range) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (level < 5) { |
|
|
|
if (level < 5) { |
|
|
|
/* huffman encoded */ |
|
|
|
/* huffman encoded */ |
|
|
|
value += get_bitalloc(gb, &dca_scalefactor, level); |
|
|
|
value += get_bitalloc(gb, &dca_scalefactor, level); |
|
|
|
} else if (level < 8) |
|
|
|
value = av_clip_uintp2(value, log2range); |
|
|
|
value = get_bits(gb, level + 1); |
|
|
|
} else if (level < 8) { |
|
|
|
|
|
|
|
if (level + 1 > log2range) { |
|
|
|
|
|
|
|
skip_bits(gb, level + 1 - log2range); |
|
|
|
|
|
|
|
value = get_bits(gb, log2range); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
value = get_bits(gb, level + 1); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return value; |
|
|
|
return value; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -719,28 +726,31 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) |
|
|
|
|
|
|
|
|
|
|
|
for (j = base_channel; j < s->prim_channels; j++) { |
|
|
|
for (j = base_channel; j < s->prim_channels; j++) { |
|
|
|
const uint32_t *scale_table; |
|
|
|
const uint32_t *scale_table; |
|
|
|
int scale_sum; |
|
|
|
int scale_sum, log_size; |
|
|
|
|
|
|
|
|
|
|
|
memset(s->scale_factor[j], 0, |
|
|
|
memset(s->scale_factor[j], 0, |
|
|
|
s->subband_activity[j] * sizeof(s->scale_factor[0][0][0]) * 2); |
|
|
|
s->subband_activity[j] * sizeof(s->scale_factor[0][0][0]) * 2); |
|
|
|
|
|
|
|
|
|
|
|
if (s->scalefactor_huffman[j] == 6) |
|
|
|
if (s->scalefactor_huffman[j] == 6) { |
|
|
|
scale_table = scale_factor_quant7; |
|
|
|
scale_table = scale_factor_quant7; |
|
|
|
else |
|
|
|
log_size = 7; |
|
|
|
|
|
|
|
} else { |
|
|
|
scale_table = scale_factor_quant6; |
|
|
|
scale_table = scale_factor_quant6; |
|
|
|
|
|
|
|
log_size = 6; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* When huffman coded, only the difference is encoded */ |
|
|
|
/* When huffman coded, only the difference is encoded */ |
|
|
|
scale_sum = 0; |
|
|
|
scale_sum = 0; |
|
|
|
|
|
|
|
|
|
|
|
for (k = 0; k < s->subband_activity[j]; k++) { |
|
|
|
for (k = 0; k < s->subband_activity[j]; k++) { |
|
|
|
if (k >= s->vq_start_subband[j] || s->bitalloc[j][k] > 0) { |
|
|
|
if (k >= s->vq_start_subband[j] || s->bitalloc[j][k] > 0) { |
|
|
|
scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum); |
|
|
|
scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum, log_size); |
|
|
|
s->scale_factor[j][k][0] = scale_table[scale_sum]; |
|
|
|
s->scale_factor[j][k][0] = scale_table[scale_sum]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (k < s->vq_start_subband[j] && s->transition_mode[j][k]) { |
|
|
|
if (k < s->vq_start_subband[j] && s->transition_mode[j][k]) { |
|
|
|
/* Get second scale factor */ |
|
|
|
/* Get second scale factor */ |
|
|
|
scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum); |
|
|
|
scale_sum = get_scale(&s->gb, s->scalefactor_huffman[j], scale_sum, log_size); |
|
|
|
s->scale_factor[j][k][1] = scale_table[scale_sum]; |
|
|
|
s->scale_factor[j][k][1] = scale_table[scale_sum]; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -769,8 +779,7 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) |
|
|
|
* (is this valid as well for joint scales ???) */ |
|
|
|
* (is this valid as well for joint scales ???) */ |
|
|
|
|
|
|
|
|
|
|
|
for (k = s->subband_activity[j]; k < s->subband_activity[source_channel]; k++) { |
|
|
|
for (k = s->subband_activity[j]; k < s->subband_activity[source_channel]; k++) { |
|
|
|
scale = get_scale(&s->gb, s->joint_huff[j], 0); |
|
|
|
scale = get_scale(&s->gb, s->joint_huff[j], 64 /* bias */, 7); |
|
|
|
scale += 64; /* bias */ |
|
|
|
|
|
|
|
s->joint_scale_factor[j][k] = scale; /*joint_scale_table[scale]; */ |
|
|
|
s->joint_scale_factor[j][k] = scale; /*joint_scale_table[scale]; */ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -791,6 +800,11 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
int am = s->amode & DCA_CHANNEL_MASK; |
|
|
|
int am = s->amode & DCA_CHANNEL_MASK; |
|
|
|
|
|
|
|
if (am >= FF_ARRAY_ELEMS(dca_default_coeffs)) { |
|
|
|
|
|
|
|
av_log(s->avctx, AV_LOG_ERROR, |
|
|
|
|
|
|
|
"Invalid channel mode %d\n", am); |
|
|
|
|
|
|
|
return AVERROR_INVALIDDATA; |
|
|
|
|
|
|
|
} |
|
|
|
for (j = base_channel; j < s->prim_channels; j++) { |
|
|
|
for (j = base_channel; j < s->prim_channels; j++) { |
|
|
|
s->downmix_coef[j][0] = dca_default_coeffs[am][j][0]; |
|
|
|
s->downmix_coef[j][0] = dca_default_coeffs[am][j][0]; |
|
|
|
s->downmix_coef[j][1] = dca_default_coeffs[am][j][1]; |
|
|
|
s->downmix_coef[j][1] = dca_default_coeffs[am][j][1]; |
|
|
@ -830,7 +844,8 @@ static int dca_subframe_header(DCAContext *s, int base_channel, int block_index) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* Scale factor index */ |
|
|
|
/* Scale factor index */ |
|
|
|
s->lfe_scale_factor = scale_factor_quant7[get_bits(&s->gb, 8)]; |
|
|
|
skip_bits(&s->gb, 1); |
|
|
|
|
|
|
|
s->lfe_scale_factor = scale_factor_quant7[get_bits(&s->gb, 7)]; |
|
|
|
|
|
|
|
|
|
|
|
/* Quantization step size * scale factor */ |
|
|
|
/* Quantization step size * scale factor */ |
|
|
|
lfe_scale = 0.035 * s->lfe_scale_factor; |
|
|
|
lfe_scale = 0.035 * s->lfe_scale_factor; |
|
|
|