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 BC4244CAD6 for ; Thu, 13 Mar 2025 11:17:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8356868BD3F; Thu, 13 Mar 2025 13:15:26 +0200 (EET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E61C468E792 for ; Thu, 13 Mar 2025 13:15:14 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-43d0a5cfd7dso5048045e9.1 for ; Thu, 13 Mar 2025 04:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864514; x=1742469314; 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=ZVVwLiQu9zxiIKrdZ6aph706dof/XdSUoYal30wNBns=; b=MyApG6Fpw48AfEC/iH29HuVMsgG60Y2kAmXVuG2IyzmmUCglqJc403JELxpvVrMoiO CJ3qpU9Tv1rBP4LNBGtnjEpNqUpcKWvlAhjPwZURPHUA/BhDzsvp0xdYJP2plVJu54DG pAcE0Qz6jMFat0EUse+ZfMBSzaOEiEfdvS25IX8yPt/3oxmVxNz9/zuPeEcT/HYbzMh5 FYZYe1ts+G4JYmtGMA3r+AyErBwOUfdQmdyVdJJm4D9R3QdAT5+67RgNoXHb/pKJrqTa rArEG2Dd1VeU1BVLq7YHIeucAl+gVrc861P7UMFyKDi+bo4+yFH7WiLC+87vC9mmLW5j lnwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864514; x=1742469314; 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=ZVVwLiQu9zxiIKrdZ6aph706dof/XdSUoYal30wNBns=; b=IkJ/CRmvephXPI4hYYXXNFF+mJ0TPjKWA3p+CCQ9/q7CGNe5YpRa3gp1GkHpHsupW8 iiJ5PSrxT71F7/W/ToYevxYJhLVap3m4rPkYOjufdLd+GexSBc9eaRwvLLJnBEwMYMh4 /+uMvZHh4bTTJg+Lvq3sSh5F4cjppuHdHbqWyJ3Xkk8V7vvdE4KarTWCvCFzDwH303By Mx1Rl7bBWbG50xk9rqzvFzphRJ+olA5btIXOJ1gdcx6DDj6QR1rQdSHu84qnyTZzsKvS CkDEJOVaLpSzWbYFF0LM2dUOu2yTwlWZRmGZ9J2dOmuQZJEgvhhx4QLNI76u/baBgXAL FOcQ== X-Gm-Message-State: AOJu0YxTMUTN3dwbZWCqiynOcgMhtVAboVVf4MFm6QVtUoLHL9Uh9zMR geOYkf3gdyADPEMyLMkIfAksbjr4R6Ogi4XCw5AmCRLzaKr5mzeOnBhQYA== X-Gm-Gg: ASbGnctDU4+dvG+dmTrVLln5dSYwAiLU+EfSJuiPscBgQWo1YWTQeW8aGQRMhhc+Fvg dSs6XIFap2u5HYKZXIfTGz038t3y8N4dC/ILU1aHaEuWenLVAkpbNKjNdQTuZKAz4NRTV6C3Cdg 7ayZRpR4cvf/lvvXCSg9GI5a0EmNWfStOLm1BdBfzWJtXbDOVv3KY6jMsv7s0wkb8ckkqPw2W+u z6jrAZs7tSGKdRHqjEdI1G782M6pHsIZoL2VuL4KB0nRd3T7cXrWDBwO4G8C8XXQIGe+8AZ3RSH olqZreG/daItFbBl+DLOV39FgO35V1vfcO5F2jAp5ww4u61TaVHnD3ub4iAIRFRLk8jr/0KMZFY l66Nx/GfSsKbYG85FrwsJS0U+xNsPia20W/sVuLgu51bTFWDevi+CpcQ= X-Google-Smtp-Source: AGHT+IGzkiawF+PIlvhIZBKDjI7zZBRo4qj7tO8g73HJJls9DdjThWk4fUMhgre/XzRF23FiMstTeg== X-Received: by 2002:a05:600c:3586:b0:43c:ec4c:25b1 with SMTP id 5b1f17b1804b1-43cec4c26d2mr148232075e9.23.1741864513893; Thu, 13 Mar 2025 04:15:13 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:13 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:14:59 +0100 Message-ID: <20250313111505.166786-7-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 06/12] avcodec/sanm: codec2 support 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 consists of 4 byte packets: 2bytes delta-x, 1 byte delta-y and 1 byte color to put at that spot. Used in Rebel Assault 1 only. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index d4a84febc7..b88756d2c6 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -607,6 +607,24 @@ static int old_codec1(SANMVideoContext *ctx, int top, return 0; } +static int old_codec2(SANMVideoContext *ctx, int top, + int left, int width, int height) +{ + uint8_t *dst = (uint8_t *)ctx->frm0, col; + int16_t xpos = left, ypos = top; + + while (bytestream2_get_bytes_left(&ctx->gb) > 3) { + xpos += bytestream2_get_le16u(&ctx->gb); + ypos += bytestream2_get_byteu(&ctx->gb); + col = bytestream2_get_byteu(&ctx->gb); + if (xpos >= 0 && ypos >= 0 && + xpos < ctx->width && ypos < ctx->height) { + *(dst + xpos + ypos * ctx->pitch) = col; + } + } + return 0; +} + static inline void codec37_mv(uint8_t *dst, const uint8_t *src, int height, int stride, int x, int y) { @@ -1304,6 +1322,8 @@ static int process_frame_obj(SANMVideoContext *ctx) case 1: case 3: return old_codec1(ctx, top, left, w, h, codec == 3); + case 2: + return old_codec2(ctx, top, left, w, h); 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".