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 D2BE74E444 for ; Tue, 11 Mar 2025 15:05:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69FAC68E138; Tue, 11 Mar 2025 17:04:03 +0200 (EET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5E6568E110 for ; Tue, 11 Mar 2025 17:03:51 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-39127512371so3160233f8f.0 for ; Tue, 11 Mar 2025 08:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705431; x=1742310231; 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=8MzCW7V6xKiZqXtCEEI6GvwMBBO+WABlRdHxAtTgQXE=; b=A2RL1VwE+ywO/X9EE1zNcHmD+gM3cIGjNoEYKq3lOLljbEYX+7z4zU6ZLC2adPWZ7m wrnzL+HURNzAw4tnKwNEhAJS1Cibfdq5QKLGezHZg4u+gcgCRZifTj+cieYUKJF1ske0 xYVTDNd3hgWCwpNI7NMSi5nSwrNH02Z/dPDoQG7QaZ4BLnMbQqdNeM5lhNAGC2ZjsRHB 7wc2lPDw0d/QpVXnz6ou1YEHNs3r/X5llM3xc38XwHw1Ls9lJF7RW6R62HrqSWKU4PfW wzdt827AcR57sAypXqEfN0xWmrdLxqBHxIMimQLImgddmxo5fyNfUhL3p3zz/k5R919Z EwOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705431; x=1742310231; 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=8MzCW7V6xKiZqXtCEEI6GvwMBBO+WABlRdHxAtTgQXE=; b=j0DAx4jDhNmEMVNVVPOfIxkE71suAdsQ8aeVxuv/bG8IvEQP9Imcw+N/jzHrr2wGuE WECu/xdSMXkgk3EMNR7ejFk0MaGxnnJ0GlQ8bZK9r53yleATlNvyjeyDakJHuq/VBNYF AIkWuhSNXPijouGXqhlizBYM8b7vzxavfR4QEr2EbwCQeRlXtZ7HGuu4uOD3GiW4EeRq zggmarKt6VQ0VjkrmFUHOuwyvnRfa/qGlWY1jZWt6mXCaxOmocqhVtuCiAGS1G8GWRqg XrAT9b54xdevvArDw0mSddPe44A10JPMp+z5cHOx1L8/xgFDuoy7ENNGSQCW05wB+Hwz LR+A== X-Gm-Message-State: AOJu0YzdvZPgjk0JC6UWmvQjh1CjfiLZywierNLt0TQtIG8CCO145XnI 87uwmJvFJYoBgak11pyt0MKNjRsKSCR+A3k84umUlTFE0Y+xzkH0tn7wEg== X-Gm-Gg: ASbGncuOM4qTDx2tEk7nm5p6GCmuhLoPR8XhwcNLlR/yEuiZPqYyOn4yetQHYo+8nCk 9aZOMFp4Q4DOBu1UuPtAbvlmIFj/OOV7i21zFBUyCQjwT368NYtYrjo2LZq3CKI4ccEBX6qZPP5 XryOMiDEMhU0w04RkpT5M6LHJhc37tY2K89fQqvA6Dd8e2eRJNzcW7e8kYrnPGqAm4tOSv3ucV3 bplFF8aIyGkY9FAV3+KkpiktfYbZgZH2fVDPu51A+ZMF0gJO2GWQ1B+ZpKHFCoIs5PiYUM8mgrD fhq9kkASnqdXd1qjfSDwKWcRqpUY4WyPviuok7z0M+pQddGbE25gwJp/8zjXjYHZlwbqdawtT1C uuV0OAWjfaXuI2TXyuYinCzckM66/lXbDbwaJ2nsqV8XXew+IoguAius= X-Google-Smtp-Source: AGHT+IGYq4VQPcxvwi6TBELJTmUMS4ZMRLY566st/NhQZsR7pFfbSTRIfv+fwe7unNbhbVPvREGopw== X-Received: by 2002:a5d:6da8:0:b0:390:e535:8770 with SMTP id ffacd0b85a97d-392640c841amr6067184f8f.14.1741705430892; Tue, 11 Mar 2025 08:03:50 -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-43ceaac390bsm115259215e9.35.2025.03.11.08.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 08:03:50 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 16:03:38 +0100 Message-ID: <20250311150341.348678-6-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311150341.348678-1-manuel.lauss@gmail.com> References: <20250311150341.348678-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/sanm: misc fixes 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: - clear the front buffer with color 0 when a new frame starts. Fixes a lot of Rebel Assault 1 videos and Rebel Assault 2 space scenes (e.g. 08PLAY.SAN which consists only of codec1+21 objects which only ever touch parts of the buffer). - for ANIMv1 (Rebel Assault 1): set palette index 0 to all zeroes. This fixes a lot of unwanted colors in e.g L1HANGAR.ANM, L2INTRO.ANM, a space scenes. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 310b1a429b..efed31b70c 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1350,6 +1350,8 @@ static int process_xpal(SANMVideoContext *ctx, int size) if (size >= PALETTE_DELTA * 2 + 4 + PALETTE_SIZE * 3) { for (i = 0; i < PALETTE_SIZE; i++) ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->gb); + if (ctx->subversion < 2) + ctx->pal[0] = 0; } } return 0; @@ -1765,6 +1767,10 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if (!ctx->version) { int to_store = 0; + /* clear the front buffer */ + if (ctx->frm0_size) + memset(ctx->frm0, 0, ctx->frm0_size); + while (bytestream2_get_bytes_left(&ctx->gb) >= 8) { uint32_t sig, size; int pos; @@ -1786,6 +1792,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, } for (i = 0; i < PALETTE_SIZE; i++) ctx->pal[i] = 0xFFU << 24 | bytestream2_get_be24u(&ctx->gb); + if (ctx->subversion < 2) + ctx->pal[0] = 0; break; case MKBETAG('F', 'O', 'B', 'J'): if (size < 16) -- 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".