virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/eamad: Don't store transient macroblock indices in context

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-07 14:15:02 +01:00
parent f6366cb5ea
commit b5be0c0aa9
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/eamad.c
View File

@@ -58,8 +58,6 @@ typedef struct MadContext {
unsigned int bitstream_buf_size; unsigned int bitstream_buf_size;
DECLARE_ALIGNED(32, int16_t, block)[64]; DECLARE_ALIGNED(32, int16_t, block)[64];
uint16_t quant_matrix[64]; uint16_t quant_matrix[64];
int mb_x;
int mb_y;
} MadContext; } MadContext;
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
@@ -148,11 +146,8 @@ static inline int decode_block_intra(MadContext *s, int16_t * block)
break; break;
} else if (level != 0) { } else if (level != 0) {
i += run; i += run;
if (i > 63) { if (i > 63)
av_log(s->avctx, AV_LOG_ERROR,
"ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
}
j = scantable[i]; j = scantable[i];
level = (level*quant_matrix[j]) >> 4; level = (level*quant_matrix[j]) >> 4;
level = (level-1)|1; level = (level-1)|1;
@@ -165,11 +160,8 @@ static inline int decode_block_intra(MadContext *s, int16_t * block)
run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6); run = SHOW_UBITS(re, &s->gb, 6)+1; LAST_SKIP_BITS(re, &s->gb, 6);
i += run; i += run;
if (i > 63) { if (i > 63)
av_log(s->avctx, AV_LOG_ERROR,
"ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
}
j = scantable[i]; j = scantable[i];
if (level < 0) { if (level < 0) {
level = -level; level = -level;
@@ -200,7 +192,7 @@ static int decode_motion(GetBitContext *gb)
return value; return value;
} }
static int decode_mb(MadContext *s, AVFrame *frame, int inter) static int decode_mb(MadContext *s, AVFrame *frame, int inter, int mb_x, int mb_y)
{ {
int mv_map = 0; int mv_map = 0;
int av_uninit(mv_x), av_uninit(mv_y); int av_uninit(mv_x), av_uninit(mv_y);
@@ -219,12 +211,15 @@ static int decode_mb(MadContext *s, AVFrame *frame, int inter)
if (mv_map & (1<<j)) { // mv_x and mv_y are guarded by mv_map if (mv_map & (1<<j)) { // mv_x and mv_y are guarded by mv_map
int add = 2*decode_motion(&s->gb); int add = 2*decode_motion(&s->gb);
if (s->last_frame->data[0]) if (s->last_frame->data[0])
comp_block(s, frame, s->mb_x, s->mb_y, j, mv_x, mv_y, add); comp_block(s, frame, mb_x, mb_y, j, mv_x, mv_y, add);
} else { } else {
s->bdsp.clear_block(s->block); s->bdsp.clear_block(s->block);
if(decode_block_intra(s, s->block) < 0) if (decode_block_intra(s, s->block) < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"ac-tex damaged at %d %d\n", mb_x, mb_y);
return -1; return -1;
idct_put(s, frame, s->block, s->mb_x, s->mb_y, j); }
idct_put(s, frame, s->block, mb_x, mb_y, j);
} }
} }
return 0; return 0;
@@ -308,9 +303,9 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
memset((uint8_t*)s->bitstream_buf + bytestream2_get_bytes_left(&gb), 0, AV_INPUT_BUFFER_PADDING_SIZE); memset((uint8_t*)s->bitstream_buf + bytestream2_get_bytes_left(&gb), 0, AV_INPUT_BUFFER_PADDING_SIZE);
init_get_bits(&s->gb, s->bitstream_buf, 8*(bytestream2_get_bytes_left(&gb))); init_get_bits(&s->gb, s->bitstream_buf, 8*(bytestream2_get_bytes_left(&gb)));
for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++) for (int mb_y = 0; mb_y < (avctx->height + 15) / 16; mb_y++)
for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++) for (int mb_x = 0; mb_x < (avctx->width + 15) / 16; mb_x++)
if(decode_mb(s, frame, inter) < 0) if (decode_mb(s, frame, inter, mb_x, mb_y) < 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
*got_frame = 1; *got_frame = 1;