Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 062cd9acc129
Choose a base ref
...
head repository: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acfe69669ccf
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 29, 2012

  1. bink: get rid of double precision float use

    Add a small table of integers instead as this is simpler and
    avoid rounding issues (though such rounding issues are unlikely in this case)
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 29, 2012
    Copy the full SHA
    574e879 View commit details
  2. bink: remove unneeded special case in the init code.

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 29, 2012
    Copy the full SHA
    897d336 View commit details
  3. bink: reindent

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni committed Sep 29, 2012
    Copy the full SHA
    acfe696 View commit details
Showing with 15 additions and 28 deletions.
  1. +15 −28 libavcodec/bink.c
43 changes: 15 additions & 28 deletions libavcodec/bink.c
Original file line number Diff line number Diff line change
@@ -1228,41 +1228,28 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
static av_cold void binkb_calc_quant(void)
{
uint8_t inv_bink_scan[64];
double s[64];
static const int s[64]={
1073741824,1489322693,1402911301,1262586814,1073741824, 843633538, 581104888, 296244703,
1489322693,2065749918,1945893874,1751258219,1489322693,1170153332, 806015634, 410903207,
1402911301,1945893874,1832991949,1649649171,1402911301,1102260336, 759250125, 387062357,
1262586814,1751258219,1649649171,1484645031,1262586814, 992008094, 683307060, 348346918,
1073741824,1489322693,1402911301,1262586814,1073741824, 843633538, 581104888, 296244703,
843633538,1170153332,1102260336, 992008094, 843633538, 662838617, 456571181, 232757969,
581104888, 806015634, 759250125, 683307060, 581104888, 456571181, 314491699, 160326478,
296244703, 410903207, 387062357, 348346918, 296244703, 232757969, 160326478, 81733730,
};
int i, j;

for (j = 0; j < 8; j++) {
for (i = 0; i < 8; i++) {
if (j && j != 4)
if (i && i != 4)
s[j*8 + i] = cos(j * M_PI/16.0) * cos(i * M_PI/16.0) * 2.0;
else
s[j*8 + i] = cos(j * M_PI/16.0) * sqrt(2.0);
else
if (i && i != 4)
s[j*8 + i] = cos(i * M_PI/16.0) * sqrt(2.0);
else
s[j*8 + i] = 1.0;
}
}

#define C (1LL<<30)
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][k] = (1L << 12) * binkb_intra_seed[i] *
binkb_num[j]/binkb_den[j];
binkb_inter_quant[j][k] = (1L << 12) * binkb_inter_seed[i] *
binkb_num[j]/binkb_den[j];
} else {
binkb_intra_quant[j][k] = (1L << 12) * binkb_intra_seed[i] * s[i] *
binkb_num[j]/(double)binkb_den[j];
binkb_inter_quant[j][k] = (1L << 12) * binkb_inter_seed[i] * s[i] *
binkb_num[j]/(double)binkb_den[j];
}
binkb_intra_quant[j][k] = binkb_intra_seed[i] * (int64_t)s[i] *
binkb_num[j]/(binkb_den[j] * (C>>12));
binkb_inter_quant[j][k] = binkb_inter_seed[i] * (int64_t)s[i] *
binkb_num[j]/(binkb_den[j] * (C>>12));
}
}
}