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 EE3A34E5F0 for ; Thu, 13 Mar 2025 11:16:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50C58687F5A; Thu, 13 Mar 2025 13:15:22 +0200 (EET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 177B768E74D for ; Thu, 13 Mar 2025 13:15:13 +0200 (EET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so4996675e9.1 for ; Thu, 13 Mar 2025 04:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864512; x=1742469312; 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=1VgImbx0Gu/I2vT8zC6p1rFwgbjNszsgFJ4h1Gtf5zM=; b=LGJ9cmNklIltEgncYumMQl7Ftw+PZjkLFlWiaN/ToF/+bCJBDBRKxx9S78jBoj9Zfa q8Y5tc2GMaY1SxDd4DGUQotBLOjOl2lpJotbFi/XQOf9haNNAt8ZaJcjwCceBy5T973G fEw7tJVo6H29ZYh2Seu+VF2IpTPtiHf8k3dOd191HSQjXVlsC/BNtd7Vm3qlcxVWZ/93 vM3NytY2fuJ4LX1GDR053AdHp2ha16itW/XSG9jFRA6yT5R4aGB0gbdAZFJ8qJUTcIua 6kzpZ6rcwmGpGp0/Dzx0GCpnOdx7p7i3j5BwHhBFVcDG6WJTAuPWlNQfZO/6lQU8jKAL cQpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864512; x=1742469312; 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=1VgImbx0Gu/I2vT8zC6p1rFwgbjNszsgFJ4h1Gtf5zM=; b=u4IxEb62NKeI4I3TUqYCg5/iIi1Lt1qoY3x7XKD2SvkCmqp0dSS+RJpXgz6Cc4Izbo 3OjmNfnhtLh4Qp8ODBPUAGkJKxpngDsFZNGJdQed0pZDQKd9o5AWuBs5i3ZSBwDD7ZJ3 QtSiQB1hNK4TQhI5oMlTlJbpWwSetHvn614R32n1l+QBuaz1bopHD9oHmwCq0Wze928M XwOmRDtr6+NldKLY9xT1zoD4RmcubNScOht+uj4hX6+uft8plemFgwJmzmYUTF1eX9K1 ycR4KsQJpGaKvmXk0X6RtpVuEVxRRnWvimnNK562sX6rMz4jTP54YbpgwSD0SMl5Z5Aw zunw== X-Gm-Message-State: AOJu0Yydadr7ZvqW3kzvR6tk5V7pkV4a68W7q26ERhTe1SEq5cN2SakN MK0idg4JAJ4Z1XRBLpGkMGnyG110yMKIu7KeJzlzLjCloQUW1TlblJ5jDg== X-Gm-Gg: ASbGncvFOXxqhMBEUI3ulUJZ+Juzk/7gsIAJVRDvO5Wu2F7ukI4FToAhBRSaCz+T9WU IJtLM+zZHyx22lCNTMHZrOZxwJpi7B4TaTyOSytZSkGc23LLIlg4o9G6+ZCqYFoOQbXwVvGAYm4 2gf5pHdg7rJi1S41etzWA1z2EJuGV6ueMLW0rawl8bi3g3fxhR5zW3Z04fHgW7G+un4IoV+g8OD abKpRxwRxt24PNLsWOYjssQH9lQDnobGqGkOiWjDygXNXpmrWqDq/GsR3lfpZW7lVGIL4Rs17bs CmnMO3ENLuOZupqqkpUh0rsCnvOCTYYcOROc21wT01kKvhgN/mU5d+gnLn7ws2+cTGgaTug6FEQ 4krwucz5tL0L6iuLsQOsqYpMMvJyrjzFKhokrPXjMMnrwjs95oLB+sX4= X-Google-Smtp-Source: AGHT+IF95F00lSe7rPY135yKIay+VAflxZlQmD1F1SqDT1EtlJPF+QFVglQLpDf/kalgVjXc3r3XKg== X-Received: by 2002:a7b:ca4c:0:b0:43c:eb00:50eb with SMTP id 5b1f17b1804b1-43ceb0054a9mr176264805e9.5.1741864512138; Thu, 13 Mar 2025 04:15:12 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:11 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:14:57 +0100 Message-ID: <20250313111505.166786-5-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 04/12] 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 processing data. Fixes a lot of Rebel Assault 1 videos and Rebel Assault 2 space scenes (e.g. 08PLAY.SAN which consists only of codec1/2/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 stray colors in e.g L1HANGAR.ANM, L2INTRO.ANM, space scenes. - Esp in RA1, there are a lot of FRME objects which don't contain any video data (prebuffering some audio only). Account for that. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 9f656e6ba8..fbb6e7231a 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -515,6 +515,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->subversion = AV_RL16(avctx->extradata); for (i = 0; i < PALETTE_SIZE; i++) ctx->pal[i] = 0xFFU << 24 | AV_RL32(avctx->extradata + 2 + i * 4); + if (ctx->subversion < 2) + ctx->pal[0] = 0xFFU << 24; } return 0; @@ -1349,6 +1351,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] = 0xFFU << 24; } } return 0; @@ -1762,7 +1766,11 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, bytestream2_init(&ctx->gb, pkt->data, pkt->size); if (!ctx->version) { - int to_store = 0; + int to_store = 0, have_pic = 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; @@ -1785,12 +1793,15 @@ 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] = 0xFFU << 24; break; case MKBETAG('F', 'O', 'B', 'J'): if (size < 16) return AVERROR_INVALIDDATA; if (ret = process_frame_obj(ctx)) return ret; + have_pic = 1; break; case MKBETAG('X', 'P', 'A', 'L'): if (ret = process_xpal(ctx, size)) @@ -1801,6 +1812,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, break; case MKBETAG('F', 'T', 'C', 'H'): memcpy(ctx->frm0, ctx->stored_frame, ctx->buf_size); + have_pic = 1; break; default: bytestream2_skip(&ctx->gb, size); @@ -1815,9 +1827,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, } if (to_store) memcpy(ctx->stored_frame, ctx->frm0, ctx->buf_size); - if ((ret = copy_output(ctx, NULL))) - return ret; - memcpy(ctx->frame->data[1], ctx->pal, 1024); + + if (have_pic && ctx->have_dimensions) { + if ((ret = copy_output(ctx, NULL))) + return ret; + memcpy(ctx->frame->data[1], ctx->pal, 1024); + *got_frame_ptr = 1; + } } else { SANMFrameHeader header; @@ -1848,12 +1864,13 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if ((ret = copy_output(ctx, &header))) return ret; + + *got_frame_ptr = 1; + } if (ctx->rotate_code) rotate_bufs(ctx, ctx->rotate_code); - *got_frame_ptr = 1; - return pkt->size; } -- 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".