1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00

libavcodec/sanm: codec47: apply top offset also to diff buffers

SAN FRME objects specify width/height as well as offsets from top/left.
These offsets need to be taken into account for the diff buffers
as well.  Fixes playback of all SAN videos of "Shadows of the Empire",
which have a constant top offset of 60 (640x272 video on a 640x480 window)
and show tons of ghosting and block artifacts.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Manuel Lauss 2024-11-08 12:51:15 +01:00 committed by Anton Khirnov
parent dc98e7989d
commit a786dd4889

View File

@ -913,8 +913,8 @@ static int old_codec47(SANMVideoContext *ctx, int top,
int i, j;
ptrdiff_t stride = ctx->pitch;
uint8_t *dst = (uint8_t *)ctx->frm0 + left + top * stride;
uint8_t *prev1 = (uint8_t *)ctx->frm1;
uint8_t *prev2 = (uint8_t *)ctx->frm2;
uint8_t *prev1 = (uint8_t *)ctx->frm1 + left + top * stride;
uint8_t *prev2 = (uint8_t *)ctx->frm2 + left + top * stride;
uint8_t auxcol[2];
int tbl_pos = bytestream2_tell(&ctx->gb);
int seq = bytestream2_get_le16(&ctx->gb);
@ -940,8 +940,8 @@ static int old_codec47(SANMVideoContext *ctx, int top,
}
if (!seq) {
ctx->prev_seq = -1;
memset(prev1, auxcol[0], ctx->height * stride);
memset(prev2, auxcol[1], ctx->height * stride);
memset(prev1, auxcol[0], (ctx->height - top) * stride);
memset(prev2, auxcol[1], (ctx->height - top) * stride);
}
switch (compr) {