virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/sanm: recognize common FOBJ sizes

Browse Source 
Change the size detection a bit to recognize common video sizes,
as the FOBJ codecs>=37 cannot always be trusted, since they can
be embedded in a larger frame.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
This commit is contained in:
Manuel Lauss
2025-04-29 13:23:31 +02:00
parent 7f0b7b0496
commit 9369ebf238
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/sanm.c
View File

@ -1603,6 +1603,7 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
uint16_t w, h, parm2; uint16_t w, h, parm2;
uint8_t codec, param; uint8_t codec, param;
int16_t left, top; int16_t left, top;
int fsc, sote;
codec = bytestream2_get_byteu(gb); codec = bytestream2_get_byteu(gb);
param = bytestream2_get_byteu(gb); param = bytestream2_get_byteu(gb);
@ -1620,6 +1621,14 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
return 0; return 0;
} }
/* codecs with their own buffers */
fsc = (codec == 37 || codec == 47 || codec == 48);
/* special case for "Shadows of the Empire" videos */
sote = ((w == 640) && (h == 272) && (codec == 47));
if (sote)
left = top = 0;
if (!ctx->have_dimensions) { if (!ctx->have_dimensions) {
int xres, yres; int xres, yres;
if (ctx->subversion < 2) { if (ctx->subversion < 2) {
@ -1633,12 +1642,24 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
yres = h; yres = h;
ctx->have_dimensions = 1; ctx->have_dimensions = 1;
} else { } else {
/* Rebel Assault 2: 424x260 internal size */ /* detect common sizes */
if (((left + w) == 424) && ((top + h) == 260)) xres = w + left;
yres = h + top;
if (sote) {
/* SotE: has top=60 at all times to center video
* inside the 640x480 game window
*/
xres = w;
yres = h;
ctx->have_dimensions = 1; ctx->have_dimensions = 1;
} else if (((xres == 424) && (yres == 260)) || /* RA1 */
((xres == 320) && (yres == 200)) || /* ft/dig/... */
((xres == 640) && (yres == 480))) { /* ol/comi/mots... */
ctx->have_dimensions = 1;
}
xres = FFMAX(left + w, ctx->width); xres = FFMAX(xres, ctx->width);
yres = FFMAX(top + h, ctx->height); yres = FFMAX(yres, ctx->height);
} }
if (ctx->width < xres || ctx->height < yres) { if (ctx->width < xres || ctx->height < yres) {
@ -1652,8 +1673,7 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
} }
} }
} else { } else {
if (((left + w > ctx->width) || (top + h > ctx->height)) if (((left + w > ctx->width) || (top + h > ctx->height)) && fsc) {
&& (codec >= 37)) {
/* correct unexpected overly large frames: this happens /* correct unexpected overly large frames: this happens
* for instance with The Dig's sq1.san video: it has a few * for instance with The Dig's sq1.san video: it has a few
* (all black) 640x480 frames halfway in, while the rest is * (all black) 640x480 frames halfway in, while the rest is
@ -1671,7 +1691,7 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb)
*/ */
if (ctx->first_fob) { if (ctx->first_fob) {
ctx->first_fob = 0; ctx->first_fob = 0;
if (codec < 37) if (!fsc)
memset(ctx->frm0, 0, ctx->frm0_size); memset(ctx->frm0, 0, ctx->frm0_size);
} }