From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 83F064E8BA for <ffmpegdev@gitmailbox.com>; Mon, 17 Mar 2025 17:51:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C18C1687C50; Mon, 17 Mar 2025 19:49:44 +0200 (EET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7117687C0D for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 19:49:26 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3996af42857so307481f8f.0 for <ffmpeg-devel@ffmpeg.org>; Mon, 17 Mar 2025 10:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742233766; x=1742838566; 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=46x9+ZW3zqgBFxEjeo0JRqqHe787ZxU0M7IXMLRBpMo=; b=DIMBU2TZRUgwCE6qmo6t6dSw5U8M6oILrGG/n9nb828yzpPS5Nxyfvy7duju5kCu+B 2u9Cqpq4CqkxxIxY865POEzgaNQSoAwqIsl/szF4bI5EeskqMWWu8e+wdjzDTM4S3O93 Omqqst03P1fV+MHxJMEUhC0YGkuKNkRkgNsDa0pGy+sqPHqq4f7HxrCLWL2I/COeGHW3 B4Gk5v8xBnLHcS7KjrG2SZzig8+QvhnbUshmv8B29FK6BxC1NwCcefLotRz+yvzgMDkB tm9YsfGkg1RH1tj+YxSFNdREVTOjCtnCWf4qq5ImJSaSaPFbcWnoVoYWT3UVq1IXZCGv AohQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742233766; x=1742838566; 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=46x9+ZW3zqgBFxEjeo0JRqqHe787ZxU0M7IXMLRBpMo=; b=KHBP273EoA5/SW2F33yd5j/uPBgoIT9MQoJHzSpYaD6nEs6sHDQXbqWqhLqzn/t/Jk PuNUqddvzChzv7ORKc9VzLDmsgxYpVfVpenexjdxwTe9NEL8DJL7tM6f7WaoFHL9c6KE C5qrZ2qvOROY5lxpwIBs56EwDOgOPfhcHaApZcFEq1wdei45hzJozBmzxejf+qfomdui 1ZT4VFa0SZp2Dp5Frm0uM/E4GPYPmUOZQNqv5BkoD6k7NXTWAcxMgw6/dnILXG9ORmoO GMwUw+Jo4IxMB5HVq2PZRfWit6hTx2Y00PlNIiM6JFLfm08w23sTdO5j9klUAtGTWzyd 7jpg== X-Gm-Message-State: AOJu0Yz2LJu4g+XGjXtvk5uyz8IQKrlKbVb/QzJ+XSVILxAIdwgGohT7 guJ5U5FPxxWxsIR1i0Q2fVPddH8vUDEnEqir0AstQJBOQ4AbqXGiIBn1XO0o X-Gm-Gg: ASbGncsuXZIm8EAI5phmhLxHL8mjY2UK2r5lOURK99a9JW/QQQ4YsFGYCDu7UuG1EhE eslJ8eBQHbWycoedOPIOeOD19hyIEIuD56HkW0o222YHs2ZliiiqtrmHeUrq6+OpY0oYmzxqs4h HppPE5HlseM1CD96T9h8mzRT8kKEp5C1PusfnQ8vAtIPRaASDM5gsUdJnCMEkXayCiKm7LEj5Kp FzalihAo8+8GTqmlBJWvva/pk1OQy3AvTN3DaIsfwTdMsX3vR3d3goYxqpEUy59IzxUJoqdKrAm Kk+JJdTh+ewOjSZY/bFVfzagtmxRBrqx3Xq4eioe5fj5hkVgqQ1oF9gX+MH0VS20LfKc3ox5qNI iTs87QO9C/rxJE+6VbP7JclKUJYPD4w== X-Google-Smtp-Source: AGHT+IEDbOEVK7fQs9EcZeHVxJoG82Zm1oKkfpiv0hJoR9OUGn86r4gVebb0BJw55DvzJ7I0pu2Cjw== X-Received: by 2002:a5d:59ab:0:b0:38f:23c4:208c with SMTP id ffacd0b85a97d-3996bb77591mr262780f8f.18.1742233765740; Mon, 17 Mar 2025 10:49:25 -0700 (PDT) Received: from flagship3.deu.mlau.at (p54bc8686.dip0.t-ipconnect.de. [84.188.134.134]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395c7df35ecsm15809347f8f.16.2025.03.17.10.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 10:49:25 -0700 (PDT) From: Manuel Lauss <manuel.lauss@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Mar 2025 18:49:09 +0100 Message-ID: <20250317174917.6872-8-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250317174917.6872-1-manuel.lauss@gmail.com> References: <20250317174917.6872-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 07/14] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Manuel Lauss <manuel.lauss@gmail.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250317174917.6872-8-manuel.lauss@gmail.com/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> 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 <manuel.lauss@gmail.com> --- v2, v3: no changes libavcodec/sanm.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 3fa6c334df..6302c62f43 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); /* on first FOBJ, when the codec is not one of the * full-buffer codecs (37/47/48), frm0 needs to be cleared. @@ -1333,6 +1393,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.49.0 _______________________________________________ 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".