eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 12:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/svq3: Remove dead topright_samples_available variable, code

Browse Source 
Topright samples are always available.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-01-10 13:21:08 +01:00
parent 42d30c9019
commit 67cccd442f
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/svq3.c
View File

@@ -128,7 +128,6 @@ typedef struct SVQ3Context {
int8_t (*intra4x4_pred_mode); int8_t (*intra4x4_pred_mode);
unsigned int top_samples_available; unsigned int top_samples_available;
unsigned int topright_samples_available;
unsigned int left_samples_available; unsigned int left_samples_available;
uint8_t *edge_emu_buffer; uint8_t *edge_emu_buffer;
@@ -638,15 +637,10 @@ static av_always_inline void hl_decode_mb_predict_luma(SVQ3Context *s,
const int dir = s->intra4x4_pred_mode_cache[scan8[i]]; const int dir = s->intra4x4_pred_mode_cache[scan8[i]];
uint8_t *topright; uint8_t *topright;
int nnz, tr; int nnz;
if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) { if (dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED) {
const int topright_avail = (s->topright_samples_available << i) & 0x8000;
av_assert2(s->mb_y || linesize <= block_offset[i]); av_assert2(s->mb_y || linesize <= block_offset[i]);
if (!topright_avail) { topright = ptr + 4 - linesize;
tr = ptr[3 - linesize] * 0x01010101u;
topright = (uint8_t *)&tr;
} else
topright = ptr + 4 - linesize;
} else } else
topright = NULL; topright = NULL;
@@ -721,7 +715,6 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; s->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
s->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; s->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
s->topright_samples_available = 0xFFFF;
if (mb_type == 0) { /* SKIP */ if (mb_type == 0) { /* SKIP */
if (s->pict_type == AV_PICTURE_TYPE_P || if (s->pict_type == AV_PICTURE_TYPE_P ||