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.
Unified · Split
| @@ -913,8 +913,8 @@ static int old_codec47(SANMVideoContext *ctx, int top, · 912 unmodified lines | ||
| 913 | 913 | int i, j; |
| 914 | 914 | ptrdiff_t stride = ctx->pitch; |
| 915 | 915 | uint8_t *dst = (uint8_t *)ctx->frm0 + left + top * stride; |
| 916 | − uint8_t *prev1 = (uint8_t *)ctx->frm1; | |
| 917 | − uint8_t *prev2 = (uint8_t *)ctx->frm2; | |
| 916 | + uint8_t *prev1 = (uint8_t *)ctx->frm1 + left + top * stride; | |
| 917 | + uint8_t *prev2 = (uint8_t *)ctx->frm2 + left + top * stride; | |
| 918 | 918 | uint8_t auxcol[2]; |
| 919 | 919 | int tbl_pos = bytestream2_tell(&ctx->gb); |
| 920 | 920 | int seq = bytestream2_get_le16(&ctx->gb); |
| @@ -940,8 +940,8 @@ static int old_codec47(SANMVideoContext *ctx, int top, · 19 unmodified lines | ||
| 940 | 940 | } |
| 941 | 941 | if (!seq) { |
| 942 | 942 | ctx->prev_seq = -1; |
| 943 | − memset(prev1, auxcol[0], ctx->height * stride); | |
| 944 | − memset(prev2, auxcol[1], ctx->height * stride); | |
| 943 | + memset(prev1, auxcol[0], (ctx->height - top) * stride); | |
| 944 | + memset(prev2, auxcol[1], (ctx->height - top) * stride); | |
| 945 | 945 | } |
| 946 | 946 | |
| 947 | 947 | switch (compr) { |