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 C1B954DE2C for ; Tue, 4 Mar 2025 17:07:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C75568ECCD; Tue, 4 Mar 2025 19:07:37 +0200 (EET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FF1D68CEEE for ; Tue, 4 Mar 2025 19:07:29 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-39104c1cbbdso1368676f8f.3 for ; Tue, 04 Mar 2025 09:07:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741108048; x=1741712848; 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=Pe4uf+DGgQb+TM/BxGF8jB5nrplgbK9447wrBklg0kw=; b=XG8mlDkTpDxkwGlD2sfZqFp6TRlNVZHSKVOiRxIzk5w8z7A+Zitqgcc3dVlb+TlEeJ seTYaA+P0w+qjEyEvhdmFK07xpn7QztAfWpC3uLDyXV+ETm/6j8KBJGQzaL5FXsjE8xP Ntj7UHzELOz62x5LkXWz8gCU+KrO+atbybLNJgXcEbyDIMem7Ddd7Eh8ZW+6mkt/6yTa TLiE0VEQRMQ4QX1N6riWw+UrzuPWrob7KFE8xT69Fy3hvQT3fyTlPl0D6y9vo43Q2sK4 ActSMgQRCvxfb9rNhf4iJGeGtdJP/LwygkQnh7q6S8C79BFXoSbGUh/2wg8KIKsBJhhz UuQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741108048; x=1741712848; 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=Pe4uf+DGgQb+TM/BxGF8jB5nrplgbK9447wrBklg0kw=; b=ZW/uSXmsGEDpX9HqsokA3i+W1/JyOdvHDuWvv0IQOulp6VuQ1doywF5dll/9+8icOj Pc6PdyBzg2kCni67q7jwPB+0ddu/gjuxFWT9fzxI9RaR/NvcNSF06epfRjdunAzrBt3J FNBA6JL34jX7yr6NALDrPwyZH5c+DMqU9OTltLftFriY/i5vtvmZje4VD3juh/0TxRZQ DJxjpIXGxIYOaEIPdWUEE4BCfHjlE+jRTI37rr8TYQvgyMs6GKtKG1+tKKswLupfWk0O f+x4DyxEJdFVn3WDnTqh0A9H0u8QKfUijFOdSe3zumGEjTn+5cMz7oHC4jFfUqV8ZwlW BESg== X-Gm-Message-State: AOJu0YxgvHYsDCy9d4ofjIicDDmmIoixuIOFAKE/ow1sf1YXsryUsMJD JeLlxI21ycdPxI0dN8vjoC+zXgHdw2fKTzvNUH98lvLE59JSQjNuVjaEjQ== X-Gm-Gg: ASbGncspjRK8j2MI+MbwQEvG132smy52h+FN8gn6qcty7dHNwNHrawmb/D4k4s+C61l BBuConZE3fWuXrtF84LQkssmo6hyL1efR/eHRQN1DKoVTKzHeAfQ3aQQvRiFojrTFG4jaPdnFUw GJAvsFMESkFjJhj/dLYPH6ISFTc+yissLYitm6b1Bs6JUK2UMQW2cg3veKDajUQgMs/RlAP+Gpu 2SSgwZznrHHO/lMrEfUlif1OGSLMCUkYZSlVRSViOus0bid45fqUmHeHUbzVvb5bejRlywiZkCz cK+uQqgCFBp6d3LCUSNIBYA2IsiUv6IPAEkTB+jFJDPh8Rktk1Nna3AwpzQrAhC57gcg6Yfv5tS DIFjA+OXrKwRMN6yb+5sQovJnU3o8/Ml5SUGa79/1j4Bp8X+eONr/32s= X-Google-Smtp-Source: AGHT+IEtrJa+Nm4/7nedjDwD6dMcRbHEmx5Bvyk63NenFqOzurnr4yrmr3Gu328QUmEPNqFqyOvhLw== X-Received: by 2002:a5d:47af:0:b0:391:10c5:d1a8 with SMTP id ffacd0b85a97d-39110c5d3dfmr6470248f8f.6.1741108048103; Tue, 04 Mar 2025 09:07:28 -0800 (PST) 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 ffacd0b85a97d-390e47b6cd8sm17978950f8f.44.2025.03.04.09.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 09:07:27 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Mar 2025 18:07:19 +0100 Message-ID: <20250304170719.602196-3-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250304170719.602196-1-manuel.lauss@gmail.com> References: <20250304170719.602196-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 3/3] avcodec/sanm: add smush codec23 decoder 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: This codec alternatingly skips and changes existing pixels. A second 16bit parameter in the FOBJ header indicates how to do the pixel changes: either by specifying a LUT in the codec datastream or by adding a constant value to the pixel. For ANIMv1 (Rebel Assault 1) the first 8bit parameter is used as a constant offset to add to the existing pixel value. Signed-off-by: Manuel Lauss --- v4: also support c23 on ANIMv0/1 (Rebel Assault 1, e.g LVL11/L11PLAY.ANM water) v3: updates due to changes in patch 2 v2: no changes. Videos showing the before/after state (Rebel Assault II LEV09/09PLAY.SAN file) http://mlau.at/ffmpeg_c23_before.mp4 http://mlau.at/ffmpeg_c23_after.mp4 notice the blue transparent forcefields. libavcodec/sanm.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 71dbac4320..534ec7aee6 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -292,6 +292,7 @@ typedef struct SANMVideoContext { int8_t p4x4glyphs[NGLYPHS][16]; int8_t p8x8glyphs[NGLYPHS][64]; uint8_t c47itbl[0x10000]; + uint8_t c23lut[256]; } SANMVideoContext; typedef struct SANMFrameHeader { @@ -555,6 +556,62 @@ static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size) return 0; } +static int old_codec23(SANMVideoContext *ctx, int top, int left, int width, + int height, uint8_t param, uint16_t param2) +{ + const uint32_t maxpxo = ctx->width * ctx->pitch; + uint8_t *dst, lut[256], c; + int i, j, k, pc, sk; + int32_t pxoff; + + if (ctx->subversion < 2) { + /* Rebel Assault 1: constant offset + 0xd0 */ + for (i = 0; i < 256; i++) + lut[i] = (i + param + 0xd0) & 0xff; + } else if (param2 == 256) { + if (bytestream2_get_bytes_left(&ctx->gb) < 256) + return AVERROR_INVALIDDATA; + bytestream2_get_bufferu(&ctx->gb, ctx->c23lut, 256); + } else if (param2 < 256) { + for (i = 0; i < 256; i++) + lut[i] = (i + param2) & 0xff; + } else { + memcpy(lut, ctx->c23lut, 256); + } + if (bytestream2_get_bytes_left(&ctx->gb) < 1) + return 0; /* some c23 frames just set up the LUT */ + + dst = (uint8_t *)ctx->frm0; + for (i = 0; i < height; i++) { + if (bytestream2_get_bytes_left(&ctx->gb) < 2) + return 0; + pxoff = left + ((top + i) * ctx->pitch); + k = bytestream2_get_le16u(&ctx->gb); + sk = 1; + pc = 0; + while (k > 0 && pc <= width) { + if (bytestream2_get_bytes_left(&ctx->gb) < 1) + return AVERROR_INVALIDDATA; + j = bytestream2_get_byteu(&ctx->gb); + if (sk) { + pxoff += j; + pc += j; + } else { + while (j--) { + if (pxoff >=0 && pxoff < maxpxo) { + c = *(dst + pxoff); + *(dst + pxoff) = lut[c]; + } + pxoff++; + pc++; + } + } + sk ^= 1; + } + } + return 0; +} + static int old_codec1(SANMVideoContext *ctx, int top, int left, int width, int height) { @@ -1237,11 +1294,15 @@ static int old_codec48(SANMVideoContext *ctx, int width, int height) static int process_frame_obj(SANMVideoContext *ctx) { - uint16_t codec = bytestream2_get_le16u(&ctx->gb); + uint16_t parm2; + uint8_t codec = bytestream2_get_byteu(&ctx->gb); + uint8_t param = bytestream2_get_byteu(&ctx->gb); int16_t left = bytestream2_get_le16u(&ctx->gb); int16_t top = bytestream2_get_le16u(&ctx->gb); uint16_t w = bytestream2_get_le16u(&ctx->gb); uint16_t h = bytestream2_get_le16u(&ctx->gb); + bytestream2_skip(&ctx->gb, 2); + parm2 = bytestream2_get_le16u(&ctx->gb); if (!w || !h) { av_log(ctx->avctx, AV_LOG_ERROR, "Dimensions are invalid.\n"); @@ -1260,12 +1321,13 @@ static int process_frame_obj(SANMVideoContext *ctx) return AVERROR(ENOMEM); } } - bytestream2_skip(&ctx->gb, 4); switch (codec) { case 1: case 3: return old_codec1(ctx, top, left, w, h); + case 23: + return old_codec23(ctx, top, left, w, h, param, parm2); case 37: return old_codec37(ctx, top, left, w, h); case 47: -- 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".