mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
bink: permute Bink version 'b' quant matrices by inverse scan order
This fixes visual glitches in Bink version 'b' files, as the quantization
tables were not being permuted.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2315392174
)
This commit is contained in:
parent
a093650b6c
commit
f20886e464
@ -1210,6 +1210,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
|
||||
*/
|
||||
static av_cold void binkb_calc_quant()
|
||||
{
|
||||
uint8_t inv_bink_scan[64];
|
||||
double s[64];
|
||||
int i, j;
|
||||
|
||||
@ -1228,17 +1229,21 @@ static av_cold void binkb_calc_quant()
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 64; i++)
|
||||
inv_bink_scan[bink_scan[i]] = i;
|
||||
|
||||
for (j = 0; j < 16; j++) {
|
||||
for (i = 0; i < 64; i++) {
|
||||
int k = inv_bink_scan[i];
|
||||
if (s[i] == 1.0) {
|
||||
binkb_intra_quant[j][i] = (1L << 12) * binkb_intra_seed[i] *
|
||||
binkb_intra_quant[j][k] = (1L << 12) * binkb_intra_seed[i] *
|
||||
binkb_num[j]/binkb_den[j];
|
||||
binkb_inter_quant[j][i] = (1L << 12) * binkb_inter_seed[i] *
|
||||
binkb_inter_quant[j][k] = (1L << 12) * binkb_inter_seed[i] *
|
||||
binkb_num[j]/binkb_den[j];
|
||||
} else {
|
||||
binkb_intra_quant[j][i] = (1L << 12) * binkb_intra_seed[i] * s[i] *
|
||||
binkb_intra_quant[j][k] = (1L << 12) * binkb_intra_seed[i] * s[i] *
|
||||
binkb_num[j]/(double)binkb_den[j];
|
||||
binkb_inter_quant[j][i] = (1L << 12) * binkb_inter_seed[i] * s[i] *
|
||||
binkb_inter_quant[j][k] = (1L << 12) * binkb_inter_seed[i] * s[i] *
|
||||
binkb_num[j]/(double)binkb_den[j];
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user