Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/imm4: Remove useless ScanTable

Browse Source 
Also rename the scantable variable to idct_permutation
to better reflect what it actually is.

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/388/head
Andreas Rheinhardt 2 years ago
parent 4c9dee6e8d
commit 0d53d92e3a
1 changed files with 9 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      libavcodec/imm4.c

24
libavcodec/imm4.c
Unescape View File

@ -51,9 +51,8 @@ typedef struct IMM4Context {
unsigned lo; unsigned lo;
unsigned hi; unsigned hi;
ScanTable intra_scantable;
DECLARE_ALIGNED(32, int16_t, block)[6][64];
IDCTDSPContext idsp; IDCTDSPContext idsp;
DECLARE_ALIGNED(32, int16_t, block)[6][64];
} IMM4Context; } IMM4Context;
static const uint8_t intra_cb[] = { static const uint8_t intra_cb[] = {
@ -129,7 +128,7 @@ static int decode_block(AVCodecContext *avctx, GetBitContext *gb,
int block, int factor, int flag, int offset, int flag2) int block, int factor, int flag, int offset, int flag2)
{ {
IMM4Context *s = avctx->priv_data; IMM4Context *s = avctx->priv_data;
const uint8_t *scantable = s->intra_scantable.permutated; const uint8_t *idct_permutation = s->idsp.idct_permutation;
int i, last, len, factor2; int i, last, len, factor2;
for (i = !flag; i < 64; i++) { for (i = !flag; i < 64; i++) {
@ -152,17 +151,17 @@ static int decode_block(AVCodecContext *avctx, GetBitContext *gb,
i += len; i += len;
if (i >= 64) if (i >= 64)
break; break;
s->block[block][scantable[i]] = offset * (factor2 < 0 ? -1 : 1) + factor * factor2; s->block[block][idct_permutation[i]] = offset * (factor2 < 0 ? -1 : 1) + factor * factor2;
if (last) if (last)
break; break;
} }
if (s->hi == 2 && flag2 && block < 4) { if (s->hi == 2 && flag2 && block < 4) {
if (flag) if (flag)
s->block[block][scantable[0]] *= 2; s->block[block][idct_permutation[0]] *= 2;
s->block[block][scantable[1]] *= 2; s->block[block][idct_permutation[1]] *= 2;
s->block[block][scantable[8]] *= 2; s->block[block][idct_permutation[8]] *= 2;
s->block[block][scantable[16]] *= 2; s->block[block][idct_permutation[16]] *= 2;
} }
return 0; return 0;
@ -172,7 +171,7 @@ static int decode_blocks(AVCodecContext *avctx, GetBitContext *gb,
unsigned cbp, int flag, int offset, unsigned flag2) unsigned cbp, int flag, int offset, unsigned flag2)
{ {
IMM4Context *s = avctx->priv_data; IMM4Context *s = avctx->priv_data;
const uint8_t *scantable = s->intra_scantable.permutated; const uint8_t *idct_permutation = s->idsp.idct_permutation;
int ret, i; int ret, i;
memset(s->block, 0, sizeof(s->block)); memset(s->block, 0, sizeof(s->block));
@ -185,7 +184,7 @@ static int decode_blocks(AVCodecContext *avctx, GetBitContext *gb,
x = 128; x = 128;
x *= 8; x *= 8;
s->block[i][scantable[0]] = x; s->block[i][idct_permutation[0]] = x;
} }
if (cbp & (1 << (5 - i))) { if (cbp & (1 << (5 - i))) {
@ -495,14 +494,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
static AVOnce init_static_once = AV_ONCE_INIT; static AVOnce init_static_once = AV_ONCE_INIT;
IMM4Context *s = avctx->priv_data; IMM4Context *s = avctx->priv_data;
uint8_t table[64];
for (int i = 0; i < 64; i++)
table[i] = i;
ff_bswapdsp_init(&s->bdsp); ff_bswapdsp_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, table);
s->prev_frame = av_frame_alloc(); s->prev_frame = av_frame_alloc();
if (!s->prev_frame) if (!s->prev_frame)

Write Preview
Loading…
Cancel
Save