har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/speedhqdec: Only keep what is used from ScanTable

Browse Source 
Namely ScanTable.permutated.

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-20 05:55:53 +02:00
parent 69f46ff586
commit da93e4fb27
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/speedhqdec.c
View File

@ -53,7 +53,7 @@
typedef struct SHQContext { typedef struct SHQContext {
BlockDSPContext bdsp; BlockDSPContext bdsp;
IDCTDSPContext idsp; IDCTDSPContext idsp;
ScanTable intra_scantable; uint8_t permutated_intra_scantable[64];
int quant_matrix[64]; int quant_matrix[64];
enum { SHQ_SUBSAMPLING_420, SHQ_SUBSAMPLING_422, SHQ_SUBSAMPLING_444 } enum { SHQ_SUBSAMPLING_420, SHQ_SUBSAMPLING_422, SHQ_SUBSAMPLING_444 }
subsampling; subsampling;
@ -137,7 +137,7 @@ static inline int decode_alpha_block(const SHQContext *s, GetBitContext *gb, uin
static inline int decode_dct_block(const SHQContext *s, GetBitContext *gb, int last_dc[4], int component, uint8_t *dest, int linesize) static inline int decode_dct_block(const SHQContext *s, GetBitContext *gb, int last_dc[4], int component, uint8_t *dest, int linesize)
{ {
const int *quant_matrix = s->quant_matrix; const int *quant_matrix = s->quant_matrix;
const uint8_t *scantable = s->intra_scantable.permutated; const uint8_t *scantable = s->permutated_intra_scantable;
LOCAL_ALIGNED_32(int16_t, block, [64]); LOCAL_ALIGNED_32(int16_t, block, [64]);
int dc_offset; int dc_offset;
@ -581,7 +581,8 @@ static av_cold int speedhq_decode_init(AVCodecContext *avctx)
ff_blockdsp_init(&s->bdsp); ff_blockdsp_init(&s->bdsp);
ff_idctdsp_init(&s->idsp, avctx); ff_idctdsp_init(&s->idsp, avctx);
ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); ff_permute_scantable(s->permutated_intra_scantable, ff_zigzag_direct,
s->idsp.idct_permutation);
switch (avctx->codec_tag) { switch (avctx->codec_tag) {
case MKTAG('S', 'H', 'Q', '0'): case MKTAG('S', 'H', 'Q', '0'):