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 A32684CA1D for ; Mon, 10 Feb 2025 18:13:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02A2E68BE22; Mon, 10 Feb 2025 20:13:01 +0200 (EET) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2862E68BD31 for ; Mon, 10 Feb 2025 20:12:53 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5de75004cd9so2034011a12.1 for ; Mon, 10 Feb 2025 10:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739211172; x=1739815972; 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=ly+PXkjLoFwSbQTJr0OG4FaiWPRTG30M+ubkK5yOaw8=; b=UpCFvokG47SYrlI+iC8wN1iyYUyHpPh8MVW2hYA9FbdaOSBW87fZXNBz14bulyXNZ/ CWhlPgfq+adQFi4oIDBnCHeQHAtynETdsUG94y+IBUZt/vjwRSwYYkKN/8tqLmJ6XttE 7/C2tjx1/KE6AOqNWrzEScxC0wXNJ/fyQgDoT4Cg3OaIPRRaLCnzDd+Zp0ZrbKJ5pM5Z gSYj6t+vpEVSQ4CJLkWr1Ee9ck8LkVvyaePT6xLNPW1NHEV6VTV2xM6L6zN//ui7mQqJ Nx2jYZ3X+JgF+mTf2hKwydcG6KqKE8NBGA4QFOZqF0CMZFGiznYSdhHO7Y3wXbNu4oxd OI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739211172; x=1739815972; 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=ly+PXkjLoFwSbQTJr0OG4FaiWPRTG30M+ubkK5yOaw8=; b=ky6jyYsLcHNTSZFEoNTqMeXsjzsYYDMcEt6e7fXwZaaCDxUqlFGMwH3bL4Uk/82BzU Njavr41adzB6PPpvwaJ71xCUn883YV62U7THyai2kcCQDtclDFxaGS/cAe871zv18cpp /T8ahgbhIXuMAn3aQkt8Ds5G/JXtfEY7DGCnLhDRlTu9q+5kDpaWt9jDXLPnOaIzfuIX 5OkiDt8PyDC5muXm2HnWexMqmx93MTJX+SPfIh2stSBunzkU7j3Qd7XiA551ya4teJ6i XaNjZy1v0q1LV3oXIduWSFZJLCnfY8aoCRbJ7pStGqGZbZa3CM2c6awITIvh6C/04YLN 5z9Q== X-Gm-Message-State: AOJu0Yw7iXytNrJSNjS8LfNds6jIVEpxU1yI1aUFohWeUlADY1dNXgUJ mtNofwTbTOLE6dWOffkYJauTGGH3cuHe3uXaI70MmYqCViiWAxsaEWpX4w== X-Gm-Gg: ASbGncvWyfUWfHYcIzpxZLTVxSxEJDtNWzb7cAFf5hDFKxniYYKwsaxV6CzyYJ/vC8/ tp2z2XRDLC6Q914gC+1Zmp7RwiSclev45YboxwRfeFVZUih+uKT5tVZORHnqdwyCvDJoVAAZUDb ctV4dcal2gg6eJzx0b0I3KMxOHgS9Eq+qcOZwOQ0Yo6o6+tmUXrQvavqdmRkbBfRnqwZa5H8Jwi n1qc3pRwX4KBLudXOf0lWmNNVAH9v4cZMrgxeuzycDOzPpy5SXHRqEYmYzQgqkGadojskK/8fBT yj5erjcGlVQG7GS1mhWV/2A1yjbRIF57ckw/eoHCao+I90Pe4se3Ga2vB2nEt9GB0NCsm/Sv71Y s1o9agSWs4GZ94TBy93UxXymtpA== X-Google-Smtp-Source: AGHT+IEcCJrX28naCHjxfl4Hu6rqXJAsh+BkMnNEpC5SxToLHp0tlV055NJPTwHz7YB+8en+jOd43w== X-Received: by 2002:a05:6402:4588:b0:5db:e91a:6baf with SMTP id 4fb4d7f45d1cf-5de45015f49mr39528107a12.14.1739211171988; Mon, 10 Feb 2025 10:12:51 -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-ab7736439bbsm903061666b.162.2025.02.10.10.12.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 10:12:51 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Feb 2025 19:12:47 +0100 Message-ID: <20250210181247.144548-3-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210181247.144548-1-manuel.lauss@gmail.com> References: <20250210181247.144548-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 --- 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 0e7cd292d0..fb055b61c7 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".