| @@ -296,11 +296,6 @@ static void encode_dc_coeffs(PutBitContext *pb, int16_t *in, · 295 unmodified lines |
| 296 | } | 296 | } |
| 297 | } | 297 | } |
| 298 | | 298 | |
| 299 | static const uint8_t run_to_cb[16] = { 0x06, 0x06, 0x05, 0x05, 0x04, 0x29, | | |
| 300 | 0x29, 0x29, 0x29, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x4C }; | | |
| 301 | static const uint8_t lev_to_cb[10] = { 0x04, 0x0A, 0x05, 0x06, 0x04, 0x28, | | |
| 302 | 0x28, 0x28, 0x28, 0x4C }; | | |
| 303 | | | |
| 304 | static void encode_ac_coeffs(PutBitContext *pb, | 299 | static void encode_ac_coeffs(PutBitContext *pb, |
| 305 | int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64]) | 300 | int16_t *in, int blocks_per_slice, int *qmat, const uint8_t ff_prores_scan[64]) |
| 306 | { | 301 | { |
| @@ -313,14 +308,14 @@ static void encode_ac_coeffs(PutBitContext *pb, · 6 unmodified lines |
| 313 | for (j = 0; j < blocks_per_slice; j++) { | 308 | for (j = 0; j < blocks_per_slice; j++) { |
| 314 | int val = QSCALE(qmat, indp, in[(j << 6) + indp]); | 309 | int val = QSCALE(qmat, indp, in[(j << 6) + indp]); |
| 315 | if (val) { | 310 | if (val) { |
| 316 | encode_codeword(pb, run, run_to_cb[FFMIN(prev_run, 15)]); | 311 | encode_codeword(pb, run, ff_prores_run_to_cb[FFMIN(prev_run, 15)]); |
| 317 | | 312 | |
| 318 | prev_run = run; | 313 | prev_run = run; |
| 319 | run = 0; | 314 | run = 0; |
| 320 | level = get_level(val); | 315 | level = get_level(val); |
| 321 | code = level - 1; | 316 | code = level - 1; |
| 322 | | 317 | |
| 323 | encode_codeword(pb, code, lev_to_cb[FFMIN(prev_level, 9)]); | 318 | encode_codeword(pb, code, ff_prores_level_to_cb[FFMIN(prev_level, 9)]); |
| 324 | | 319 | |
| 325 | prev_level = level; | 320 | prev_level = level; |
| 326 | | 321 | |