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 0BC124C8F8 for ; Tue, 11 Feb 2025 07:25:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5593868BDBF; Tue, 11 Feb 2025 09:25:21 +0200 (EET) Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 438C768B9FD for ; Tue, 11 Feb 2025 09:25:03 +0200 (EET) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ab771575040so1005620666b.1 for ; Mon, 10 Feb 2025 23:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739258702; x=1739863502; 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=Wdvbwce6/EprrC/MRqrEYtcxERupGUBGjz+zqpc+NcQ=; b=MoVUs2y12YwPswCR9D0K9oxq8LgZytYjZfXdHJ0RNef4mILiBai3/4JQyPz+9mDMY0 XBr8v+miT5+1nbFSobUGYKM+P4uPJeWhQjBUMy8NG1yqh/uNeSL76+vWAZH4ndvHUCth u5AhRPPG1wYxg1ZnBbmLiIDna7F4PMI7UAZF4/8LFP1vAnrP3mV3wpHwKPiPkap3xMnA h+0L0+X+UMpiJjav/VG8OkPpLvEOKS6Av/t6FbSgQ8bWfVkxsFFR2WDtfsr5wLLsAxjy y1AzjnaSNsIGQftQIriSvfqwRrs0ijkx/rPiYU8/j7I/UIT74Md54GAukhZ9lnoc91p5 tScA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739258702; x=1739863502; 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=Wdvbwce6/EprrC/MRqrEYtcxERupGUBGjz+zqpc+NcQ=; b=NVUY69wDWEFk5iGw23orZ2KtFbpfXE4iOCFz8dba7JvpdsbUC+m2Fd2camwhF7krSj ElMjHnIuaNAYG26T9+OCy9RTKRrsKvy9YiIgJnpOrCSPLJdcGgYORUwAi/dj0Qh4E7bm nRaGQA64nU3NvirFsfb7Xj3P/1Ff/6aYSpvKoQK+4WiiVwqKpIMhQh5AziSmXgb9Qnmg u/1Bln3ahU3GMsZQjOnTqHFMwrb2R/Cce2YYZ5DwzdTvDqyIt9leQuEw9hX/M0lkUoj6 xv7ZTF4Lz3eAxhEzvUlZntdDkkquM/uWKlHmoAkA8CyKJSxNEvPdIy4SQIHdwiBDvWWb 5zTw== X-Gm-Message-State: AOJu0YzGUXFF/272tw3Jb3CkJX5s068nHlNrytNoOHJavhs0prMrh6Oa F4p1kXEEyaLh4nU6+V+x+tnaHAKsapvHmdcSXu1D1y8uQGhWof/gg1ftnQ== X-Gm-Gg: ASbGncvb/r6FdmEg3W3++TdZHTopAehv88ZBjQDnR+jZeOZQUG0I65r3BITxKvrdFlW mcPKlvP3b/P7K+mS5V83UYbq51tgMl98Dj9BRVpICN2oUHrHbV7kqFAoXiv+Wk9f37Vy8UI3eEI PH3q9T+ymusf9PYuB1lzMsHX930xsmgB8q+3c/CZNNaGQJpiJlBhE/oUMOdKahn4XgOWjIMVuKf aAKItuzmkv/GvRqNIs4VdfRRmM8V2x4a1kx+Nvqik5Y6B42MQiiLayZwW0oOMZ5rmfCB7+59fYS ZIl18odK+rS7Ml8yx92pzJKUZly180qUTB43jkMqcMORofF5RMEzeaRzrnbr85XC0L8J57nOgCO OUwrzGbL7iWGkkIdZV7a2vLRV5Q== X-Google-Smtp-Source: AGHT+IGWobfgiCLaOZfc0IbPxuAQkUF2K7uTbT5MEqgxlGzebp4hmB1ZyH+JMpaebxePRoIUsbjxiw== X-Received: by 2002:a17:907:3fa4:b0:ab2:c0b0:3109 with SMTP id a640c23a62f3a-ab7db35c07cmr191300866b.21.1739258702329; Mon, 10 Feb 2025 23:25:02 -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 a640c23a62f3a-ab7cbc313c5sm255326666b.150.2025.02.10.23.25.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 23:25:01 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Feb 2025 08:24:49 +0100 Message-ID: <20250211072449.7100-3-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211072449.7100-1-manuel.lauss@gmail.com> References: <20250211072449.7100-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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. Signed-off-by: Manuel Lauss --- 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 | 62 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 71dbac4320..d5c4191aa5 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,58 @@ 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 (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 +1290,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 +1317,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".