virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

avcodec/agm: 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 04:38:10 +02:00
parent ee0e03fe77
commit 0702fefd88
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/agm.c
View File

@ -88,7 +88,7 @@ typedef struct AGMContext {
int luma_quant_matrix[64]; int luma_quant_matrix[64];
int chroma_quant_matrix[64]; int chroma_quant_matrix[64];
ScanTable scantable; uint8_t permutated_scantable[64];
DECLARE_ALIGNED(32, int16_t, block)[64]; DECLARE_ALIGNED(32, int16_t, block)[64];
int16_t *wblocks; int16_t *wblocks;
@ -195,7 +195,7 @@ static int read_code(GetBitContext *gb, int *oskip, int *level, int *map, int mo
static int decode_intra_blocks(AGMContext *s, GetBitContext *gb, static int decode_intra_blocks(AGMContext *s, GetBitContext *gb,
const int *quant_matrix, int *skip, int *dc_level) const int *quant_matrix, int *skip, int *dc_level)
{ {
const uint8_t *scantable = s->scantable.permutated; const uint8_t *scantable = s->permutated_scantable;
int level, ret, map = 0; int level, ret, map = 0;
memset(s->wblocks, 0, s->wblocks_size); memset(s->wblocks, 0, s->wblocks_size);
@ -237,7 +237,7 @@ static int decode_inter_blocks(AGMContext *s, GetBitContext *gb,
const int *quant_matrix, int *skip, const int *quant_matrix, int *skip,
int *map) int *map)
{ {
const uint8_t *scantable = s->scantable.permutated; const uint8_t *scantable = s->permutated_scantable;
int level, ret; int level, ret;
memset(s->wblocks, 0, s->wblocks_size); memset(s->wblocks, 0, s->wblocks_size);
@ -272,7 +272,7 @@ static int decode_inter_blocks(AGMContext *s, GetBitContext *gb,
static int decode_intra_block(AGMContext *s, GetBitContext *gb, static int decode_intra_block(AGMContext *s, GetBitContext *gb,
const int *quant_matrix, int *skip, int *dc_level) const int *quant_matrix, int *skip, int *dc_level)
{ {
const uint8_t *scantable = s->scantable.permutated; const uint8_t *scantable = s->permutated_scantable;
const int offset = s->plus ? 0 : 1024; const int offset = s->plus ? 0 : 1024;
int16_t *block = s->block; int16_t *block = s->block;
int level, ret, map = 0; int level, ret, map = 0;
@ -362,7 +362,7 @@ static int decode_inter_block(AGMContext *s, GetBitContext *gb,
const int *quant_matrix, int *skip, const int *quant_matrix, int *skip,
int *map) int *map)
{ {
const uint8_t *scantable = s->scantable.permutated; const uint8_t *scantable = s->permutated_scantable;
int16_t *block = s->block; int16_t *block = s->block;
int level, ret; int level, ret;
@ -1249,7 +1249,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->idct_algo = FF_IDCT_SIMPLE; avctx->idct_algo = FF_IDCT_SIMPLE;
ff_idctdsp_init(&s->idsp, avctx); ff_idctdsp_init(&s->idsp, avctx);
ff_init_scantable(s->idsp.idct_permutation, &s->scantable, ff_zigzag_direct); ff_permute_scantable(s->permutated_scantable, ff_zigzag_direct,
s->idsp.idct_permutation);
s->prev_frame = av_frame_alloc(); s->prev_frame = av_frame_alloc();
if (!s->prev_frame) if (!s->prev_frame)