| @@ -34,6 +34,7 @@ · 33 unmodified lines |
| 34 | | 34 | |
| 35 | #include "libavutil/intmath.h" | 35 | #include "libavutil/intmath.h" |
| 36 | #include "avcodec.h" | 36 | #include "avcodec.h" |
| | 37 | #include "proresdata.h" |
| 37 | #include "proresdsp.h" | 38 | #include "proresdsp.h" |
| 38 | #include "get_bits.h" | 39 | #include "get_bits.h" |
| 39 | | 40 | |
| @@ -75,29 +76,6 @@ typedef struct { · 35 unmodified lines |
| 75 | } ProresContext; | 76 | } ProresContext; |
| 76 | | 77 | |
| 77 | | 78 | |
| 78 | static const uint8_t progressive_scan[64] = { | | |
| 79 | 0, 1, 8, 9, 2, 3, 10, 11, | | |
| 80 | 16, 17, 24, 25, 18, 19, 26, 27, | | |
| 81 | 4, 5, 12, 20, 13, 6, 7, 14, | | |
| 82 | 21, 28, 29, 22, 15, 23, 30, 31, | | |
| 83 | 32, 33, 40, 48, 41, 34, 35, 42, | | |
| 84 | 49, 56, 57, 50, 43, 36, 37, 44, | | |
| 85 | 51, 58, 59, 52, 45, 38, 39, 46, | | |
| 86 | 53, 60, 61, 54, 47, 55, 62, 63 | | |
| 87 | }; | | |
| 88 | | | |
| 89 | static const uint8_t interlaced_scan[64] = { | | |
| 90 | 0, 8, 1, 9, 16, 24, 17, 25, | | |
| 91 | 2, 10, 3, 11, 18, 26, 19, 27, | | |
| 92 | 32, 40, 33, 34, 41, 48, 56, 49, | | |
| 93 | 42, 35, 43, 50, 57, 58, 51, 59, | | |
| 94 | 4, 12, 5, 6, 13, 20, 28, 21, | | |
| 95 | 14, 7, 15, 22, 29, 36, 44, 37, | | |
| 96 | 30, 23, 31, 38, 45, 52, 60, 53, | | |
| 97 | 46, 39, 47, 54, 61, 62, 55, 63 | | |
| 98 | }; | | |
| 99 | | | |
| 100 | | | |
| 101 | static av_cold int decode_init(AVCodecContext *avctx) | 79 | static av_cold int decode_init(AVCodecContext *avctx) |
| 102 | { | 80 | { |
| 103 | ProresContext *ctx = avctx->priv_data; | 81 | ProresContext *ctx = avctx->priv_data; |
| @@ -175,10 +153,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, · 71 unmodified lines |
| 175 | if (ctx->scantable_type != ctx->frame_type) { | 153 | if (ctx->scantable_type != ctx->frame_type) { |
| 176 | if (!ctx->frame_type) | 154 | if (!ctx->frame_type) |
| 177 | ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, | 155 | ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, |
| 178 | progressive_scan); | 156 | ff_prores_progressive_scan); |
| 179 | else | 157 | else |
| 180 | ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, | 158 | ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, |
| 181 | interlaced_scan); | 159 | ff_prores_interlaced_scan); |
| 182 | ctx->scantable_type = ctx->frame_type; | 160 | ctx->scantable_type = ctx->frame_type; |
| 183 | } | 161 | } |
| 184 | | 162 | |
| @@ -352,16 +330,6 @@ static inline int decode_vlc_codeword(GetBitContext *gb, uint8_t codebook) · 167 unmodified lines |
| 352 | #define LSB2SIGN(x) (-((x) & 1)) | 330 | #define LSB2SIGN(x) (-((x) & 1)) |
| 353 | #define TOSIGNED(x) (((x) >> 1) ^ LSB2SIGN(x)) | 331 | #define TOSIGNED(x) (((x) >> 1) ^ LSB2SIGN(x)) |
| 354 | | 332 | |
| 355 | #define FIRST_DC_CB 0xB8 // rice_order = 5, exp_golomb_order = 6, switch_bits = 0 | | |
| 356 | | | |
| 357 | static uint8_t dc_codebook[4] = { | | |
| 358 | 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0 | | |
| 359 | 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0 | | |
| 360 | 0x4D, // rice_order = 2, exp_golomb_order = 3, switch_bits = 1 | | |
| 361 | 0x70 // rice_order = 3, exp_golomb_order = 4, switch_bits = 0 | | |
| 362 | }; | | |
| 363 | | | |
| 364 | | | |
| 365 | /** | 333 | /** |
| 366 | * Decode DC coefficients for all blocks in a slice. | 334 | * Decode DC coefficients for all blocks in a slice. |
| 367 | */ | 335 | */ |
| @@ -380,7 +348,7 @@ static inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out, · 12 unmodified lines |
| 380 | delta = 3; | 348 | delta = 3; |
| 381 | | 349 | |
| 382 | for (i = 1; i < nblocks; i++, out += 64) { | 350 | for (i = 1; i < nblocks; i++, out += 64) { |
| 383 | code = decode_vlc_codeword(gb, dc_codebook[FFMIN(FFABS(delta), 3)]); | 351 | code = decode_vlc_codeword(gb, ff_prores_dc_codebook[FFMIN(FFABS(delta), 3)]); |
| 384 | | 352 | |
| 385 | sign = -(((delta >> 15) & 1) ^ (code & 1)); | 353 | sign = -(((delta >> 15) & 1) ^ (code & 1)); |
| 386 | delta = (((code + 1) >> 1) ^ sign) - sign; | 354 | delta = (((code + 1) >> 1) ^ sign) - sign; |
| @@ -390,26 +358,6 @@ static inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out, · 3 unmodified lines |
| 390 | } | 358 | } |
| 391 | | 359 | |
| 392 | | 360 | |
| 393 | static uint8_t ac_codebook[7] = { | | |
| 394 | 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0 | | |
| 395 | 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0 | | |
| 396 | 0x4C, // rice_order = 2, exp_golomb_order = 3, switch_bits = 0 | | |
| 397 | 0x05, // rice_order = 0, exp_golomb_order = 1, switch_bits = 1 | | |
| 398 | 0x29, // rice_order = 1, exp_golomb_order = 2, switch_bits = 1 | | |
| 399 | 0x06, // rice_order = 0, exp_golomb_order = 1, switch_bits = 2 | | |
| 400 | 0x0A, // rice_order = 0, exp_golomb_order = 2, switch_bits = 2 | | |
| 401 | }; | | |
| 402 | | | |
| 403 | /** | | |
| 404 | * Lookup tables for adaptive switching between codebooks | | |
| 405 | * according with previous run/level value. | | |
| 406 | */ | | |
| 407 | static uint8_t run_to_cb_index[16] = | | |
| 408 | { 5, 5, 3, 3, 0, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 2 }; | | |
| 409 | | | |
| 410 | static uint8_t lev_to_cb_index[10] = { 0, 6, 3, 5, 0, 1, 1, 1, 1, 2 }; | | |
| 411 | | | |
| 412 | | | |
| 413 | /** | 361 | /** |
| 414 | * Decode AC coefficients for all blocks in a slice. | 362 | * Decode AC coefficients for all blocks in a slice. |
| 415 | */ | 363 | */ |
| @@ -429,20 +377,20 @@ static inline void decode_ac_coeffs(GetBitContext *gb, DCTELEM *out, · 13 unmodified lines |
| 429 | block_mask = blocks_per_slice - 1; | 377 | block_mask = blocks_per_slice - 1; |
| 430 | | 378 | |
| 431 | for (pos = blocks_per_slice - 1; pos < max_coeffs;) { | 379 | for (pos = blocks_per_slice - 1; pos < max_coeffs;) { |
| 432 | run_cb_index = run_to_cb_index[FFMIN(run, 15)]; | 380 | run_cb_index = ff_prores_run_to_cb_index[FFMIN(run, 15)]; |
| 433 | lev_cb_index = lev_to_cb_index[FFMIN(level, 9)]; | 381 | lev_cb_index = ff_prores_lev_to_cb_index[FFMIN(level, 9)]; |
| 434 | | 382 | |
| 435 | bits_left = get_bits_left(gb); | 383 | bits_left = get_bits_left(gb); |
| 436 | if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) | 384 | if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) |
| 437 | return; | 385 | return; |
| 438 | | 386 | |
| 439 | run = decode_vlc_codeword(gb, ac_codebook[run_cb_index]); | 387 | run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]); |
| 440 | | 388 | |
| 441 | bits_left = get_bits_left(gb); | 389 | bits_left = get_bits_left(gb); |
| 442 | if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) | 390 | if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) |
| 443 | return; | 391 | return; |
| 444 | | 392 | |
| 445 | level = decode_vlc_codeword(gb, ac_codebook[lev_cb_index]) + 1; | 393 | level = decode_vlc_codeword(gb, ff_prores_ac_codebook[lev_cb_index]) + 1; |
| 446 | | 394 | |
| 447 | pos += run + 1; | 395 | pos += run + 1; |
| 448 | if (pos >= max_coeffs) | 396 | if (pos >= max_coeffs) |
| @@ -629,7 +577,6 @@ static int decode_picture(ProresContext *ctx, int pic_num, · 180 unmodified lines |
| 629 | } | 577 | } |
| 630 | | 578 | |
| 631 | | 579 | |
| 632 | #define FRAME_ID MKBETAG('i', 'c', 'p', 'f') | | |
| 633 | #define MOVE_DATA_PTR(nbytes) buf += (nbytes); buf_size -= (nbytes) | 580 | #define MOVE_DATA_PTR(nbytes) buf += (nbytes); buf_size -= (nbytes) |
| 634 | | 581 | |
| 635 | static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, | 582 | static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, |