Revision b0d58795

View differences:

libavcodec/vp8.c
494 494
                for (l = 0; l < NUM_DCT_TOKENS-1; l++)
495 495
                    if (vp56_rac_get_prob_branchy(c, vp8_token_update_probs[i][j][k][l])) {
496 496
                        int prob = vp8_rac_get_uint(c, 8);
497
                        for (m = 0; m < 16; m++)
498
                            if (vp8_coeff_band[m] == j)
499
                                s->prob->token[i][m][k][l] = prob;
497
                        for (m = 0; vp8_coeff_band_indexes[j][m] >= 0; m++)
498
                            s->prob->token[i][vp8_coeff_band_indexes[j][m]][k][l] = prob;
500 499
                    }
501 500

  
502 501
    if ((s->mbskip_enabled = vp8_rac_get(c)))
libavcodec/vp8data.h
293 293
    0, 1, 2, 3, 6, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7
294 294
};
295 295

  
296
/* Inverse of vp8_coeff_band: mappings of bands to coefficient indexes.
297
 * Each list is -1-terminated. */
298
static const int8_t vp8_coeff_band_indexes[8][10] =
299
{
300
    {0, -1},
301
    {1, -1},
302
    {2, -1},
303
    {3, -1},
304
    {5, -1},
305
    {6, -1},
306
    {4, 7, 8, 9, 10, 11, 12, 13, 14, -1},
307
    {15, -1}
308
};
309

  
296 310
static const uint8_t vp8_dct_cat1_prob[] = { 159, 0 };
297 311
static const uint8_t vp8_dct_cat2_prob[] = { 165, 145, 0 };
298 312
static const uint8_t vp8_dct_cat3_prob[] = { 173, 148, 140, 0 };

Also available in: Unified diff