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

avcodec/aic: Remove useless ScanTable

Browse Source 
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-19 18:22:55 +02:00
parent 3cabe958a7
commit 4c9dee6e8d
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/aic.c
View File

@ -143,7 +143,6 @@ typedef struct AICContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *frame; AVFrame *frame;
IDCTDSPContext idsp; IDCTDSPContext idsp;
ScanTable scantable;
int num_x_slices; int num_x_slices;
int slice_width; int slice_width;
@ -348,10 +347,10 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
for (mb = 0; mb < slice_width; mb++) { for (mb = 0; mb < slice_width; mb++) {
for (blk = 0; blk < 4; blk++) { for (blk = 0; blk < 4; blk++) {
if (!ctx->interlaced) if (!ctx->interlaced)
recombine_block(ctx->block, ctx->scantable.permutated, recombine_block(ctx->block, ctx->idsp.idct_permutation,
&base_y, &ext_y); &base_y, &ext_y);
else else
recombine_block_il(ctx->block, ctx->scantable.permutated, recombine_block_il(ctx->block, ctx->idsp.idct_permutation,
&base_y, &ext_y, blk); &base_y, &ext_y, blk);
unquant_block(ctx->block, ctx->quant, ctx->quant_matrix); unquant_block(ctx->block, ctx->quant, ctx->quant_matrix);
ctx->idsp.idct(ctx->block); ctx->idsp.idct(ctx->block);
@ -368,7 +367,7 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
Y += 16; Y += 16;
for (blk = 0; blk < 2; blk++) { for (blk = 0; blk < 2; blk++) {
recombine_block(ctx->block, ctx->scantable.permutated, recombine_block(ctx->block, ctx->idsp.idct_permutation,
&base_c, &ext_c); &base_c, &ext_c);
unquant_block(ctx->block, ctx->quant, ctx->quant_matrix); unquant_block(ctx->block, ctx->quant, ctx->quant_matrix);
ctx->idsp.idct(ctx->block); ctx->idsp.idct(ctx->block);
@ -444,7 +443,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
{ {
AICContext *ctx = avctx->priv_data; AICContext *ctx = avctx->priv_data;
int i; int i;
uint8_t scan[64];
ctx->avctx = avctx; ctx->avctx = avctx;
@ -452,9 +450,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
ff_idctdsp_init(&ctx->idsp, avctx); ff_idctdsp_init(&ctx->idsp, avctx);
for (i = 0; i < 64; i++)
scan[i] = i;
ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, scan);
for (i = 0; i < 64; i++) for (i = 0; i < 64; i++)
ctx->quant_matrix[ctx->idsp.idct_permutation[i]] = aic_quant_matrix[i]; ctx->quant_matrix[ctx->idsp.idct_permutation[i]] = aic_quant_matrix[i];