virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make tables generation insensitive to floating-point implementation

Browse Source 
Using doubles make the double -> int cast well defined for all the values
used, with the exception of when s[i]==1.0, which is special-cased.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Vitor Sessak 2011-02-12 10:15:58 +01:00 committed by Mans Rullgard
parent e063f5886b
commit 47d62c965b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/bink.c
View File

@ -1217,30 +1217,37 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
*/ */
static av_cold void binkb_calc_quant() static av_cold void binkb_calc_quant()
{ {
float s[64]; double s[64];
int i, j; int i, j;
for (j = 0; j < 8; j++) { for (j = 0; j < 8; j++) {
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (j && j != 4) if (j && j != 4)
if (i && i != 4) if (i && i != 4)
s[j*8 + i] = cos(j * M_PI/16.0f) * cos(i * M_PI/16.0f) * 2.0f; s[j*8 + i] = cos(j * M_PI/16.0) * cos(i * M_PI/16.0) * 2.0;
else else
s[j*8 + i] = cos(j * M_PI/16.0f) * sqrt(2.0f); s[j*8 + i] = cos(j * M_PI/16.0) * sqrt(2.0);
else else
if (i && i != 4) if (i && i != 4)
s[j*8 + i] = cos(i * M_PI/16.0f) * sqrt(2.0f); s[j*8 + i] = cos(i * M_PI/16.0) * sqrt(2.0);
else else
s[j*8 + i] = 1.0f; s[j*8 + i] = 1.0;
} }
} }
for (j = 0; j < 16; j++) { for (j = 0; j < 16; j++) {
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (s[i] == 1.0) {
binkb_intra_quant[j][i] = (1L << 12) * binkb_intra_seed[i] *
binkb_num[j]/binkb_den[j];
binkb_inter_quant[j][i] = (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][i] = (1L << 12) * binkb_intra_seed[i] * s[i] *
binkb_num[j]/(float)binkb_den[j]; binkb_num[j]/(double)binkb_den[j];
binkb_inter_quant[j][i] = (1L << 12) * binkb_inter_seed[i] * s[i] * binkb_inter_quant[j][i] = (1L << 12) * binkb_inter_seed[i] * s[i] *
binkb_num[j]/(float)binkb_den[j]; binkb_num[j]/(double)binkb_den[j];
}
} }
} }
} }