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 BAFED4E5E3 for ; Thu, 13 Mar 2025 11:16:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C760768C21E; Thu, 13 Mar 2025 13:15:23 +0200 (EET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16C0168E789 for ; Thu, 13 Mar 2025 13:15:14 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43cf848528aso7078205e9.2 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=1741864513; x=1742469313; 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=5lYgWYh5FR90LkHajAYWVd7JHeGiD0YR4VF8zEdfQ+s=; b=cgk27gmyzl/GZom5Q++Au7DoyRt3GFvuFDjq6DzX52/ySgQp3VY3pxu8aUSpvtc5f1 DXQ4SAmFbdIMaL/4+i68/EFgxS9kX06r4fF8sWMOY6UWgHWNgB3s4RZY/FxMZrisS56K yozIiwet70zRhLw65Mh0gERlD+X1VjvmsM/CFdpG8FNXBIpEjHid5ZCiOvg5V9bI0nFg xawFTlSAWVXk3agdrRREtVGseLfU+Lcdmscl749fJH4ALGT32+GR785QegGo52iRG7jE xGc6OEGTWAP1onOMunhSz6syhjZQTKZBRbx8ll1o0g1jmZDAlLwk2geppIZvpYi0TbvB UMOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864513; x=1742469313; 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=5lYgWYh5FR90LkHajAYWVd7JHeGiD0YR4VF8zEdfQ+s=; b=PVC+2l9saC7vEIqOnrMr0enCZSpx7bPdDKYXCayzzk7KMG/PPAxrBqU+gtOt8ZufOO EB296APogEWylqS/B7uNDJY3qvnmXTsq2qFfwveJ5sO8C/gmBktJv1htSPxCAIn31ln8 HpnziEijdth8xz+L0giKN/KnZVkqlhL7oWn9Ss2AsFJDIhpfFCFb0HkmDzoLfzTQuKS7 80XupS0G0eqcOQLcBh3+BP3lVkE3lhscyffucvFkfqE22HkzMHd/P7G286j/MgFG3UaZ ZFN11EagaAWivDdlBOfuW0s4YLoYhFbV4QmodAaF/ExuUuLppcgHJirn2awFdTa+uMxP Lhlw== X-Gm-Message-State: AOJu0YwivLf+NNYLi1tUkCgbzkUBY5uXEibKxJoEBHDrTlPEZPHe0jlt aO2k2fYktwcbtapLB1ObS70RNOyw/bl5nNhggauyZjgcsP4QCRevErYTVg== X-Gm-Gg: ASbGncsSZsYlFpjFKIWQtMVfp0UtUJCyyz13HizpovEnLLhqa+fyFYh/caQg2gueo41 hSDqzQRaJj5Knae79lQSl0B6EIYgwhgJN689CsAGPb/JAZJPaGsud/sW/sSDlqzN8BBd9QN+HGZ 8Xw0Z9NTD5jWGmDW8iWUCfCeWNxrQ2nbbqBhQttt6D+XqjX5acRKVuOxwJO/U+fIzqo/Fw1Buhx drZ81BOmM8PAoWWS+JTrA42Q0BmlJF67w285FF0A6gIqyJwxaXCZzTYK3pgZLRUV9b009qFDKNN E+RDhLCQlc93bZsid5CMCXEOd7CfvGjQNc/4+6zBXmMbeVMC7A9jmKHWz4l1/hAQaCkv2nkQkAX SucjhzbtoeonaIRE0kc/NGUb7lf6+jeNWJatOB8gTi85nu7QE4NV7Ilg= X-Google-Smtp-Source: AGHT+IFCmwMty0MbYdsQkhvzfjoVexhd3tv7/u298cMunDuJyK2z2joPlpn8CfUVkDVwE8wzzNZM9Q== X-Received: by 2002:a05:600c:5812:b0:43d:1824:aadc with SMTP id 5b1f17b1804b1-43d1824ab86mr15600175e9.29.1741864513154; 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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:12 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:14:58 +0100 Message-ID: <20250313111505.166786-6-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 05/12] avcodec/sanm: fix codec3 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: codec3 is codec1 which writes zero values instead of skipping them. This fixes a lot of RA1 videos. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index fbb6e7231a..d4a84febc7 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -558,7 +558,7 @@ static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size) } static int old_codec1(SANMVideoContext *ctx, int top, - int left, int width, int height) + int left, int width, int height, int opaque) { int i, j, len, flag, code, val, end, pxoff; const int maxpxo = ctx->height * ctx->pitch; @@ -581,7 +581,7 @@ static int old_codec1(SANMVideoContext *ctx, int top, code = (code >> 1) + 1; if (flag) { val = bytestream2_get_byteu(&ctx->gb); - if (val) { + if (val || opaque) { for (j = 0; j < code; j++) { if (pxoff >= 0 && pxoff < maxpxo) *(dst + pxoff) = val; @@ -595,7 +595,7 @@ static int old_codec1(SANMVideoContext *ctx, int top, return AVERROR_INVALIDDATA; for (j = 0; j < code; j++) { val = bytestream2_get_byteu(&ctx->gb); - if ((pxoff >= 0) && (pxoff < maxpxo) && val) + if ((pxoff >= 0) && (pxoff < maxpxo) && (val || opaque)) *(dst + pxoff) = val; pxoff++; } @@ -1303,7 +1303,7 @@ static int process_frame_obj(SANMVideoContext *ctx) switch (codec) { case 1: case 3: - return old_codec1(ctx, top, left, w, h); + return old_codec1(ctx, top, left, w, h, codec == 3); 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".