diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:26:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 17:26:37 +0100 |
| commit | 18d870da83b172c89495b6543001b2ecdf4ae1e2 (patch) | |
| tree | 4728252b4549ba0ebb0b7ce03a6d04d29c7d4a41 /libavcodec/proresenc_kostya.c | |
| parent | 5ba1648318161b394499a04e8fc7385ee2fbf375 (diff) | |
| parent | d6acefe05862af244fd5a30ae946ed507c063994 (diff) | |
| download | ffmpeg-streaming-18d870da83b172c89495b6543001b2ecdf4ae1e2.zip ffmpeg-streaming-18d870da83b172c89495b6543001b2ecdf4ae1e2.tar.gz | |
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
proresenc: Drop unnecessary DCT permutation bits
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresenc_kostya.c')
| -rw-r--r-- | libavcodec/proresenc_kostya.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 71c2cb4..aaeec0e 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -193,9 +193,9 @@ typedef struct ProresContext { int16_t quants[MAX_STORED_Q][64]; int16_t custom_q[64]; const uint8_t *quant_mat; + const uint8_t *scantable; ProresDSPContext dsp; - ScanTable scantable; int mb_width, mb_height; int mbs_per_slice; @@ -429,7 +429,7 @@ static int encode_slice_plane(ProresContext *ctx, PutBitContext *pb, encode_dcs(pb, blocks, blocks_per_slice, qmat[0]); encode_acs(pb, blocks, blocks_per_slice, plane_size_factor, - ctx->scantable.permutated, qmat); + ctx->scantable, qmat); flush_put_bits(pb); return (put_bits_count(pb) - saved_pos) >> 3; @@ -676,7 +676,7 @@ static int estimate_slice_plane(ProresContext *ctx, int *error, int plane, bits = estimate_dcs(error, td->blocks[plane], blocks_per_slice, qmat[0]); bits += estimate_acs(error, td->blocks[plane], blocks_per_slice, - plane_size_factor, ctx->scantable.permutated, qmat); + plane_size_factor, ctx->scantable, qmat); return FFALIGN(bits, 8); } @@ -1078,9 +1078,8 @@ static av_cold int encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); ff_proresdsp_init(&ctx->dsp, avctx); - ff_init_scantable(ctx->dsp.dct_permutation, &ctx->scantable, - interlaced ? ff_prores_interlaced_scan - : ff_prores_progressive_scan); + ctx->scantable = interlaced ? ff_prores_interlaced_scan + : ff_prores_progressive_scan; mps = ctx->mbs_per_slice; if (mps & (mps - 1)) { |
