mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-20 07:48:15 +02:00
libavcodec/sanm: clear codec47 diff buffers with specific color
The codec47 header provides colors to use to clear the 2 difference buffers. This fixes artifacts (black hair, faces) in Curse of Monkey Island "CURSERNG.SAN" video. Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
85fec8d90f
commit
dc98e7989d
@ -915,13 +915,16 @@ static int old_codec47(SANMVideoContext *ctx, int top,
|
|||||||
uint8_t *dst = (uint8_t *)ctx->frm0 + left + top * stride;
|
uint8_t *dst = (uint8_t *)ctx->frm0 + left + top * stride;
|
||||||
uint8_t *prev1 = (uint8_t *)ctx->frm1;
|
uint8_t *prev1 = (uint8_t *)ctx->frm1;
|
||||||
uint8_t *prev2 = (uint8_t *)ctx->frm2;
|
uint8_t *prev2 = (uint8_t *)ctx->frm2;
|
||||||
|
uint8_t auxcol[2];
|
||||||
int tbl_pos = bytestream2_tell(&ctx->gb);
|
int tbl_pos = bytestream2_tell(&ctx->gb);
|
||||||
int seq = bytestream2_get_le16(&ctx->gb);
|
int seq = bytestream2_get_le16(&ctx->gb);
|
||||||
int compr = bytestream2_get_byte(&ctx->gb);
|
int compr = bytestream2_get_byte(&ctx->gb);
|
||||||
int new_rot = bytestream2_get_byte(&ctx->gb);
|
int new_rot = bytestream2_get_byte(&ctx->gb);
|
||||||
int skip = bytestream2_get_byte(&ctx->gb);
|
int skip = bytestream2_get_byte(&ctx->gb);
|
||||||
|
|
||||||
bytestream2_skip(&ctx->gb, 9);
|
bytestream2_skip(&ctx->gb, 7);
|
||||||
|
auxcol[0] = bytestream2_get_byteu(&ctx->gb);
|
||||||
|
auxcol[1] = bytestream2_get_byteu(&ctx->gb);
|
||||||
decoded_size = bytestream2_get_le32(&ctx->gb);
|
decoded_size = bytestream2_get_le32(&ctx->gb);
|
||||||
bytestream2_skip(&ctx->gb, 8);
|
bytestream2_skip(&ctx->gb, 8);
|
||||||
|
|
||||||
@ -937,8 +940,8 @@ static int old_codec47(SANMVideoContext *ctx, int top,
|
|||||||
}
|
}
|
||||||
if (!seq) {
|
if (!seq) {
|
||||||
ctx->prev_seq = -1;
|
ctx->prev_seq = -1;
|
||||||
memset(prev1, 0, ctx->height * stride);
|
memset(prev1, auxcol[0], ctx->height * stride);
|
||||||
memset(prev2, 0, ctx->height * stride);
|
memset(prev2, auxcol[1], ctx->height * stride);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (compr) {
|
switch (compr) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user