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 A0AE04E5F0 for ; Thu, 13 Mar 2025 11:17:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF3E0687A8C; Thu, 13 Mar 2025 13:15:27 +0200 (EET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7BD168E78F for ; Thu, 13 Mar 2025 13:15:15 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43cf848528aso7078485e9.2 for ; Thu, 13 Mar 2025 04:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864515; x=1742469315; 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=CZJILFJltiEQlLfQO4soZlhA5xNE9MZEjeiClnnz7qc=; b=SJRX2dKbNnW1PHw2pThAYgVlJ6AGEzaJzNbhM1rnmKsWdCepNQep4rC9L8fiwYtXEv jV2Oy1ygwfUdePbjEu82jx9U5g7Hmo7qyL4f05zdpVQ0m1AtAQzEWNsp6II8RfbbJ3bg iPykcNmUILEvf7Vkuj5yzbTqP0+h7C9boL7KQgj7Pob5NAdrVRiqq/cIjTgIbN81DGOa 1Anep807cg3v2QBpjnvV1OuYlyta4uiui+ZOg1Ec09k+jQaocB423xPkTrfk3TgaXBNe LTA2APv2eNW+O1tR28pzsnu6fE3gAgEZGTIDmlrKSgr6kqbFlvVHK9qCC0IcRdeaVRAu pfUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864515; x=1742469315; 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=CZJILFJltiEQlLfQO4soZlhA5xNE9MZEjeiClnnz7qc=; b=gR+Qmo+sLjSsWfcGxKFcIfZkE1UUxAf+PQ2MN7cCT+Y60n1cTCxT4WQZcML6ZuuxZW xYe3tfwqqdOwGqPvlK3DVA3DdrdyM841/QhrR7ItImcMy25JX/zCu+bOUI6JNrkog4Uh SgfAXRW4lJxRYmUVOCX6VKRJo7Y6bmXY3q1a5A74ut5fqt2Ecw0x1m99tPpwP25ihlrm fYviNdtVaJRth3w+FGNdMpDLd5jmSmZTNsBF71u+YuFkREDVWsw0OTC0fUepqMwB34Jx YosokGHFtGB1bm0gNFNsUhexGSEPzFw+OQZJ9UiIbLr1lpHsKd1nXadEbRbJZPyIB+xo FGyQ== X-Gm-Message-State: AOJu0YyfbWXCZNXQefoI6OEArE48ADsXVQ4ES6+chIkhUZtdElFrFL/q FFPW3Gwr4AjXKWWk9DrKhH3OyDNBKUIlf6Ad+SOOTkoLF8iBdVR3JYFakA== X-Gm-Gg: ASbGncsf1OBC0KDzHoP6+BfV01TryAAlkqeE4JEyKnpBVOdyxHMyQ2A73lEQHXtqDUa nSOWAfznCGrz1K0CfSzpsXD+juJIy2Kj3wXE7jmOyRXqfNdLXGBJzx5/6/eRSpiJA8qaDlM29Tw zd77TYxNPLF1/0/56jHgtySvpGE2Q+d4DbRWjnFcfmtahUrxX/pVAD2Q7B/53pfXDDXFdclBmdH HL3Vy6RIGHR+emFEmItRRBMxfJVr/jYva9pHh7J+5BmkzvdnfaLU2Jw7VjGL3EhmNnZHccKXTWe 5xQ4XIq3MB8scqeP+g5ItTGn09fTtepUukBCL2AhZUuIpNKVNoBF3x5UFBSBfZtPAvrLSK6D8y1 Q3L7iGRL3NWO9zszMhCZGYt9TfXhAH3BVgShgDHgL+EYDHC1abxe87j8= X-Google-Smtp-Source: AGHT+IGBvzQaRnTABNrepXeoIm3PPEfgCTk+BgmbwWBJNMtoAu7Qmwbdy6cMq16iTaUBLB3xni6t6Q== X-Received: by 2002:a05:600c:1d12:b0:43c:eec7:eab7 with SMTP id 5b1f17b1804b1-43d01bdd224mr134155435e9.11.1741864515025; Thu, 13 Mar 2025 04:15:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:14 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:15:00 +0100 Message-ID: <20250313111505.166786-8-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 07/12] avcodec/sanm: 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 --- libavcodec/sanm.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index b88756d2c6..67963bb5d3 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 { @@ -557,6 +558,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->height * 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, int opaque) { @@ -1258,11 +1315,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 < 1 || h < 1 || w > 800 || h > 600 || left > 800 || top > 600) { av_log(ctx->avctx, AV_LOG_WARNING, @@ -1316,7 +1377,6 @@ static int process_frame_obj(SANMVideoContext *ctx) h = ctx->height; } } - bytestream2_skip(&ctx->gb, 4); switch (codec) { case 1: @@ -1324,6 +1384,8 @@ static int process_frame_obj(SANMVideoContext *ctx) return old_codec1(ctx, top, left, w, h, codec == 3); case 2: return old_codec2(ctx, top, left, w, h); + case 23: + return old_codec23(ctx, top, left, w, h, param, parm2); case 37: return old_codec37(ctx, 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".