From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 530104CAD5 for ; Thu, 13 Mar 2025 11:15:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A95868E782; Thu, 13 Mar 2025 13:15:19 +0200 (EET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7538368E710 for ; Thu, 13 Mar 2025 13:15:11 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso4858585e9.0 for ; Thu, 13 Mar 2025 04:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864511; x=1742469311; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JYpwgFJxxgsibLM/58HC5nUvau0XpbhXCsAOBNsJ20o=; b=Rhu632z19xcF8M9L5vikPww9GQ+/4zOB36p89gyIzcL3Pgr7+OpU150Ma+LQzrXIzF 2bQpXvtXo2L7xBIyfk6tNwb4IAf4lV8NUGYO6lah8G8+zO3GgQY8A71MZoJvm5oWM1I8 lKBf+r3jJEvqSiQCLLv5FdBiQC6Y7Md2clomEMwn8RpHfVKZm9TdTjzSr1iOT3jhtbkk b8V3OARwKGOFuIFUrzyscSmJdq+BVHtHPiuOTBJy/bPDMOQyCvMVGaJpC3qHMODeySUA ce6n0JeI50CGnosF9rdwBiXJ41423FP7gbyYm6tuVE7MiUuxI55XvjHBIoLqRk/mPw9T j4rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864511; x=1742469311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JYpwgFJxxgsibLM/58HC5nUvau0XpbhXCsAOBNsJ20o=; b=Lc2ZXkLKEG6iI0QqShRCbFnwOo89k/OADfgvh6gnxOE+40oJcdFeZyPMgw4PyLEOLz 5F6epungs1GzWczWroUVqTmTzNh9adReK4cuIcLwpJILkjbuQvfD1ATzFjxvn1ZzGBl9 Uwfzb01gnzqmzJO5SsaUwk3JN22iGsBr58VbkqCG04ULkKJebXdV7/6vUntzZtrbXjW6 vObrEX0hWl9TjxqoVeVfWuWGCXe9bcIMyYruYpCVyVbFGaidLXIviWR97Ap0hzkbySKa t2hg47yqK4ccIPbfNpzbGFDnpJq4cueCUg0aWEZnSy+4azlqQJXZHNCh/eXAonp9Yn6q IEdw== X-Gm-Message-State: AOJu0YwPUAYtOLs8zp517l00toQF92FiYo69J+pHLP5IcDiSO+QsGk7q APboQ5mhBkIBs/PGhxfHnJHJ3ZnE1yI4VRzGFlEHKZ6NDQ3KqxRFrWjO0g== X-Gm-Gg: ASbGncstQfGFV4SOnvedlsrHBTCZBIQmbU3XDsTfIOendRz0MwOfvX27ufT/x0O5Hsu azrMnVeswZp1ttdvIpHAA6Ie1iwYq4OaheoJs7UyjjOja4A8PRM8Bv1ZgXQz1EnZ9qxPoOEVm/8 wENcIrGQbGjilN88C74yHR544L1i3Edzwyo1MVVB3VyiGi+SnwDlUIZEeGoKpWtHGb6qrHgA2XX qrPHhx4nIGarlu1S1i/FsspLk1NJdzHIAavj8XhmArDvr01N8C4GQJGLy7VLlmW0xgzw0NC9dFo ndFd7dmD4+AsTv9lirk32hkeiC0jUyklcQLrdCiiIhHIARDY8hY5+6dXwrM12R2bEtVgk+C+7ze ++L7lzqR6Y6XswoL/gQ8vybsuzWLfE3NTORi1gwt4a2BCRhczCNhJZ6k= X-Google-Smtp-Source: AGHT+IGRwFrvqmzBqgwy7BkBZfXsG77667X0EmkamlQK1O++OMDxZDXzGy0V2p1helBoDYB40iZecg== X-Received: by 2002:a05:600c:4fce:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-43d01c25c64mr90736495e9.25.1741864510445; Thu, 13 Mar 2025 04:15:10 -0700 (PDT) Received: from flagship3.deu.mlau.at (p200300c0271f29004c5623f045c27bca.dip0.t-ipconnect.de. [2003:c0:271f:2900:4c56:23f0:45c2:7bca]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d0a75b324sm50153795e9.24.2025.03.13.04.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:10 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:14:55 +0100 Message-ID: <20250313111505.166786-3-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313111505.166786-1-manuel.lauss@gmail.com> References: <20250313111505.166786-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/12] avcodec/sanm: disable left/top for fullscreen codecs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Manuel Lauss Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The block-based codecs 37/47/48 work on the full frame, and there's no existing LucasArts game video that uses left/top offsets for these, as it doesn't make sense. Ignore the left/top parameters for these codecs. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 0795d664fa..63956c01d6 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -621,8 +621,7 @@ static inline void codec37_mv(uint8_t *dst, const uint8_t *src, } } -static int old_codec37(SANMVideoContext *ctx, int top, - int left, int width, int height) +static int old_codec37(SANMVideoContext *ctx, int width, int height) { int i, j, k, l, t, run, len, code, skip, mx, my; ptrdiff_t stride = ctx->pitch; @@ -638,8 +637,8 @@ static int old_codec37(SANMVideoContext *ctx, int top, flags = bytestream2_get_byte(&ctx->gb); bytestream2_skip(&ctx->gb, 3); - if (decoded_size > ctx->height * stride - left - top * stride) { - decoded_size = ctx->height * stride - left - top * stride; + if (decoded_size > ctx->height * stride) { + decoded_size = ctx->height * stride; av_log(ctx->avctx, AV_LOG_WARNING, "Decoded size is too large.\n"); } @@ -649,8 +648,8 @@ static int old_codec37(SANMVideoContext *ctx, int top, FFSWAP(uint16_t*, ctx->frm1, ctx->frm2); } - dst = ((uint8_t*)ctx->frm1) + left + top * stride; - prev = ((uint8_t*)ctx->frm2) + left + top * stride; + dst = ((uint8_t*)ctx->frm1); + prev = ((uint8_t*)ctx->frm2); if (mvoff > 2) { av_log(ctx->avctx, AV_LOG_ERROR, "Invalid motion base value %d.\n", mvoff); @@ -925,15 +924,14 @@ static void codec47_comp1(SANMVideoContext *ctx, uint8_t *dst_in, int width, } } -static int old_codec47(SANMVideoContext *ctx, int top, - int left, int width, int height) +static int old_codec47(SANMVideoContext *ctx, int width, int height) { uint32_t decoded_size; 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 + left + top * stride; - uint8_t *prev2 = (uint8_t *)ctx->frm2 + left + top * stride; + uint8_t *dst = (uint8_t *)ctx->frm0; + uint8_t *prev1 = (uint8_t *)ctx->frm1; + uint8_t *prev2 = (uint8_t *)ctx->frm2; uint8_t auxcol[2]; int tbl_pos = bytestream2_tell(&ctx->gb); int seq = bytestream2_get_le16(&ctx->gb); @@ -947,8 +945,8 @@ static int old_codec47(SANMVideoContext *ctx, int top, decoded_size = bytestream2_get_le32(&ctx->gb); bytestream2_skip(&ctx->gb, 8); - if (decoded_size > ctx->height * stride - left - top * stride) { - decoded_size = ctx->height * stride - left - top * stride; + if (decoded_size > ctx->height * stride) { + decoded_size = ctx->height * stride; av_log(ctx->avctx, AV_LOG_WARNING, "Decoded size is too large.\n"); } @@ -959,8 +957,8 @@ static int old_codec47(SANMVideoContext *ctx, int top, } if (!seq) { ctx->prev_seq = -1; - memset(prev1, auxcol[0], (ctx->height - top) * stride); - memset(prev2, auxcol[1], (ctx->height - top) * stride); + memset(prev1, auxcol[0], ctx->height * stride); + memset(prev2, auxcol[1], ctx->height * stride); } switch (compr) { @@ -1282,7 +1280,8 @@ static int process_frame_obj(SANMVideoContext *ctx) } } } else { - if ((left + w > ctx->width) || (top + h > ctx->height)) { + if (((left + w > ctx->width) || (top + h > ctx->height)) + && codec >= 37) { /* correct unexpected overly large frames: this happens * for instance with The Dig's sq1.san video: it has a few * (all black) 640x480 frames halfway in, while the rest is @@ -1290,7 +1289,6 @@ static int process_frame_obj(SANMVideoContext *ctx) */ av_log(ctx->avctx, AV_LOG_WARNING, "resizing too large fobj: %d %d @ %d %d c %d\n", w, h, left, top, codec); - left = top = 0; w = ctx->width; h = ctx->height; } @@ -1302,9 +1300,9 @@ static int process_frame_obj(SANMVideoContext *ctx) case 3: return old_codec1(ctx, top, left, w, h); case 37: - return old_codec37(ctx, top, left, w, h); + return old_codec37(ctx, w, h); case 47: - return old_codec47(ctx, top, left, w, h); + return old_codec47(ctx, w, h); case 48: return old_codec48(ctx, w, h); default: -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".