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 55FA04E617 for ; Thu, 13 Mar 2025 11:17:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39F7B68D7A9; Thu, 13 Mar 2025 13:15:29 +0200 (EET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41FF06801DB for ; Thu, 13 Mar 2025 13:15:21 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso7311285e9.1 for ; Thu, 13 Mar 2025 04:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864520; x=1742469320; 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=kC01wK/7ctD4wFQbgAiIv0lOAjGSsHvXOJZABT7/cYM=; b=Hwgs1t0P1l+U0q4smFsulTsauAO7c9DNYjJ9RF2bLs7Ma59j+Afkh3n6AjncGi8Sf7 cnTco23g5pNpS9110oK/xWgzgHhjg2CUIxVpb0IOT9Y4K3ZB+8LzNZPcokwpJpVIMoTJ M5xSbVHEjSF7PST4tX58H+kxnwIOXBY52Ix9uNncQpVw1XPzADJtX3mfR8iZgYs8UamQ zVEqQVdPfQtfS296DFx4COZ+zuyYdNTiVq4fm7DVoGqvIpNU0ks3exILUcePyL9wj53+ CKQWb545IrgdnAhl2cSberOwidW8FR0IMkEYDKLCcatBiZ2JQjTYKIERCfuxyfbBxeVG gUkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864520; x=1742469320; 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=kC01wK/7ctD4wFQbgAiIv0lOAjGSsHvXOJZABT7/cYM=; b=RoBneTVvdJpmj9VeJGRFd23qefFc4c+cVAigQk0At07Mfkz95if4uU6TWwvvbs+EX3 HkOOcdhmBBHd8k7kYPMYvW9cImZ7x5RnAF5qplJL3v5CAyuW/uP8DGkQkmexlkwYclQU W1l7QlngZVLQEoWEbXXBGXnnAPsMVp6sDv4H17tiA96adbxXnf41PNMUkd88hdfWd8yU XbnJK3PDXxnn6+rkGw+dZaiA6g7XItSQMQV68DxdT/wQm5CJlM5I1ZMlpejxD8jueVlu DwpUXPc3hBTRT2MWX4RFgMsFxqqDPBmF+cIT9MzheKjV26ksMV9iinBprIT+byiPVign up7g== X-Gm-Message-State: AOJu0YzQxb4pzFC9bdTLfEtuqyGNiW9DxjKYQDlxScaM62LLlSGGahlI JgOy9bG+uVMd1N2qrlZzeH8V7PINcG1d/8tHvuxbUT1zFEaJPzgSVNBEww== X-Gm-Gg: ASbGncu/hOLVvi3TFM1tRCMWLrbU8/U6pOWAKKOyF0gIqddyuhkkQx7IyzwNJK4GJtP ozmyfizGBZXGIVWT7WdafM4PcBtiW4yTV+5FGHy2PvFLSV5VaZwnARtEz+rhYQCSLBuLyCQJmln f4+YaRFQKw48fscinza2KjZp3+rIWw64iMIvs7cMsmfolESAbZiJNadZYWD92Xuu4dsd73zx6ns ikxjaxZuYWcARx9a2QaUy3s1hw0EP2bwFueu498N0+MYibA3Q6sfxxKrwWBv2R+u3gBdXfs6903 xUZsyb7KqHb5U+c3Ti1Y2pHZ2j+jK48lXW5ynnhMeatcrO8Old6w0q///1wDOiGjxNkLRNs406f sa0gDKZbK7YrZm+/Dg7t9dCkgJpT4p+J+up5NbbcRjsJNq9X7rq8wNyw= X-Google-Smtp-Source: AGHT+IH1+qG50k1e3yl8iyy7Fi4PBpjrmFNhsmGPSFCusnL4IcCi99GD369Z0oFKiEbbx9GA6IzIqQ== X-Received: by 2002:a05:600c:45cc:b0:43c:fe9f:ab90 with SMTP id 5b1f17b1804b1-43cfe9feaebmr129250465e9.28.1741864520316; Thu, 13 Mar 2025 04:15:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:19 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:15:05 +0100 Message-ID: <20250313111505.166786-13-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 12/12] avcodec/sanm: properly implement STOR/FTCH for ANIMv1 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: Handle STOR/FTCH the same way the RA1 game engine does: On STOR, save the next following FOBJ (not the decoded image) in a buffer; decode it on FTCH. Used extensively by Rebel Assault 1 for e.g. the cockpit: A STOR-ed codec21 object which only covers parts of the buffer is FTCHed as last object in the stack. For ANIMv2 keep the current system to store the decoded image, as replaying a FOBJ would not work with codecs37/47/48 due to sequence violations. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 207db4a8fb..da7fb4a9e0 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1671,6 +1671,57 @@ static int process_frame_obj(SANMVideoContext *ctx) } } +static int process_ftch(SANMVideoContext *ctx, int size) +{ + GetByteContext gb, *old_gb = ctx->gb; + uint8_t *sf = ctx->stored_frame; + int xoff, yoff, left, top, ret; + uint32_t sz; + + /* FTCH defines additional x/y offsets */ + if (size != 12) { + if (bytestream2_get_bytes_left(ctx->gb) < 6) + return AVERROR_INVALIDDATA; + bytestream2_skip(ctx->gb, 2); + xoff = bytestream2_get_le16u(ctx->gb); + yoff = bytestream2_get_le16u(ctx->gb); + } else { + if (bytestream2_get_bytes_left(ctx->gb) < 12) + return AVERROR_INVALIDDATA; + bytestream2_skip(ctx->gb, 4); + xoff = bytestream2_get_be32u(ctx->gb); + yoff = bytestream2_get_be32u(ctx->gb); + } + + sz = *(uint32_t *)(sf + 0); + if ((sz > 0) && (sz <= ctx->stored_frame_size - 4)) { + /* add the FTCH offsets to the left/top values of the stored FOBJ */ + left = av_le2ne16(*(int16_t *)(sf + 4 + 2)); + top = av_le2ne16(*(int16_t *)(sf + 4 + 4)); + *(int16_t *)(sf + 4 + 2) = av_le2ne16(left + xoff); + *(int16_t *)(sf + 4 + 4) = av_le2ne16(top + yoff); + + /* decode the stored FOBJ */ + bytestream2_init(&gb, sf + 4, sz); + ctx->gb = &gb; + ret = process_frame_obj(ctx); + ctx->gb = old_gb; + + /* now restore the original left/top values again */ + *(int16_t *)(sf + 4 + 2) = av_le2ne16(left); + *(int16_t *)(sf + 4 + 4) = av_le2ne16(top); + } else { + /* this happens a lot in RA1: The individual files are meant to + * be played in sequence, with some referencing objects STORed + * by previous files, e.g. the cockpit codec21 object in RA1 LVL8. + * But spamming the log with errors is also not helpful, so + * here we simply ignore this case. + */ + ret = 0; + } + return ret; +} + static int process_xpal(SANMVideoContext *ctx, int size) { int16_t *dp = ctx->delta_pal; @@ -2158,6 +2209,29 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (ret = process_frame_obj(ctx)) return ret; have_pic = 1; + + /* STOR: for ANIMv0/1 store the whole FOBJ datablock, as it + * needs to be replayed on FTCH, since none of the codecs + * it uses work on the full buffer. + * For ANIMv2, it's enough to store the current framebuffer. + */ + if (to_store) { + to_store = 0; + if (ctx->subversion < 2) { + if (size + 4 <= ctx->stored_frame_size) { + int pos2 = bytestream2_tell(ctx->gb); + bytestream2_seek(ctx->gb, pos, SEEK_SET); + *(uint32_t *)(ctx->stored_frame) = size; + bytestream2_get_bufferu(ctx->gb, ctx->stored_frame + 4, size); + bytestream2_seek(ctx->gb, pos2, SEEK_SET); + } else { + av_log(avctx, AV_LOG_ERROR, "FOBJ too large for STOR\n"); + ret = AVERROR(ENOMEM); + } + } else { + memcpy(ctx->stored_frame, ctx->frm0, ctx->buf_size); + } + } break; case MKBETAG('X', 'P', 'A', 'L'): if (ret = process_xpal(ctx, size)) @@ -2167,8 +2241,12 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, to_store = 1; break; case MKBETAG('F', 'T', 'C', 'H'): - memcpy(ctx->frm0, ctx->stored_frame, ctx->buf_size); - have_pic = 1; + if (ctx->subversion < 2) { + if (ret = process_ftch(ctx, size)) + return ret; + } else { + memcpy(ctx->frm0, ctx->stored_frame, ctx->buf_size); + } break; default: bytestream2_skip(ctx->gb, size); @@ -2181,8 +2259,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (size & 1) bytestream2_skip(ctx->gb, 1); } - if (to_store) - memcpy(ctx->stored_frame, ctx->frm0, ctx->buf_size); if (have_pic && ctx->have_dimensions) { if ((ret = copy_output(ctx, NULL))) -- 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".