ffmpeg | branch: master | Manuel Lauss <manuel.la...@gmail.com> | Tue Mar 11 12:26:24 2025 +0100| [8a045260808be660818d58589fbb6b36dd0dfb5d] | committer: Manuel Lauss
avcodec/sanm: codec37: reimplement comp4 Compression 4 code 0 means copy from delta buffer without mv, AND start of a skip run. This gets rid of the extra case and column index manipulation and implements this as it is implemented in the original game exe, i.e. as a special case for after mv copy. Signed-off-by: Manuel Lauss <manuel.la...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a045260808be660818d58589fbb6b36dd0dfb5d --- libavcodec/sanm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 5bb35df9e0..9486e298cf 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1106,16 +1106,17 @@ static int old_codec37(SANMVideoContext *ctx, int width, int height) t = bytestream2_get_byteu(&ctx->gb); for (k = 0; k < 4; k++) memset(dst + i + k * stride, t, 4); - } else if ((compr == 4) && (code == 0)) { - if (bytestream2_get_bytes_left(&ctx->gb) < 1) - return AVERROR_INVALIDDATA; - skip_run = bytestream2_get_byteu(&ctx->gb) + 1; - i -= 4; } else { mx = c37_mv[(mvoff * 255 + code) * 2]; my = c37_mv[(mvoff * 255 + code) * 2 + 1]; codec37_mv(dst + i, prev + i + mx + my * stride, ctx->height, stride, i + mx, j + my); + + if ((compr == 4) && (code == 0)) { + if (bytestream2_get_bytes_left(&ctx->gb) < 1) + return AVERROR_INVALIDDATA; + skip_run = bytestream2_get_byteu(&ctx->gb); + } } } dst += stride * 4; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
