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 113894CAD5 for ; Thu, 13 Mar 2025 11:17:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F1FF68E164; Thu, 13 Mar 2025 13:15:30 +0200 (EET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C54136801DB for ; Thu, 13 Mar 2025 13:15:16 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43cf848528aso7078605e9.2 for ; Thu, 13 Mar 2025 04:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864516; x=1742469316; 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=rPbueDn/RyW3i1CpixCxvFmhlvPEyu/LTmq8KNpb43s=; b=RepUnsqyvjFzib0vW+XNbteUxZpJOkdrBuST2uPuDJAaq6gRDSRAzvODz7/E4TxWcf QC5MezTEOIAFtrqHxBWCIHV6ltdlKAB4KqJC3sOyAY+wyvl8FbkQlcAhKs7JqN3GHaip Et99f4BmccnL1YkoeBtPR9TzoFwtGExDRZQ8/uzpeI5gyoLG1Dms27FNhWu/JQlX+PaA e4vfnu5BSEhoii19lMr4FMtl0dj2LvkdbMdr3jGUAp0x1V+4p3m5rrCN4rrIlbEeQ8C+ v8+QqGeeut2ZeKrQG+xXQTJcGt17pX+ZWSWJMqGx+QmwL1rukj1W6T0Xeiqyt5KET7ZD XVdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864516; x=1742469316; 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=rPbueDn/RyW3i1CpixCxvFmhlvPEyu/LTmq8KNpb43s=; b=LAHBvBPdhVDiHNBXV3E8f+yr3YzUawqho10cSmd559kjsKGM6paopweuyOWD/4mP4U 9CdKBC5aOPyJ4QI5VQ/kzeXYRnsGPpYRPq9A6J9yz8MnGxhDXmSDU45Tb5W63d1d4BK2 U/jw/xlPcIKjCuwV/M7VbBqGhm8qoKzVhSL7KpOY/ixL8mDSgDWqF5PBE7U1SVnaEhR3 3hoWxWwTQnXe5pKhOs7lp1gUjIiXb3Tkm6INeTwrxTyDUgx/IUcBdHc8UDWQr+fM1tRk nO4ZlTezdVq5AeZkFIS0O+SD14vbSqi037TgeazI0uNmRli3Y2mdoVc53hzjZxrpRx8A 0MNQ== X-Gm-Message-State: AOJu0YySr5TmtFKf16f3jQTiF/g42q1Y/UiObo8sPX0pMLBN4rc0UD/1 8ZwKhGFpyoyCmPe0VZZmdMlULkjQpKIZsDdnKPFQK3gOe87FA+M4WXqTuw== X-Gm-Gg: ASbGnct+nUdynyG8AlXXjikWptklLgq2ASG8M7dpinxBX1l7p3J9z42bEdzFRqAHNMl LlaowaaP4uVORd37O20Z/gAxqqBbEZpQqrVVRl+kncKTp1v50ZD/Xq7pg7ekWRMgJdHat5/DIou aOjNkIeu0hx1g0h10FBtk9QWIECBvDRHx8x5zyduFORaRq2YI2l2zzSgR3Nyq5JMTYRRB1D4BEW euju2ADMeJxKopbJ/NCJhFgN/jBR/ie/FScoTbeoYxuCGO5ROUE2dD+8tzKRV2JYY14+xkXDLYu 3TQ7y87M4Aoca9wvoiUb6fuzQyJFgz8p7/9ntTjKAcyYQYJXccMheUOVIYd0mY+ZJaO89hYlo/N /GrM6uUpKIdUZBHpbRbD1iWMti/Wun+dKTCaiBh1/qj1v5cmrwSz51Vs= X-Google-Smtp-Source: AGHT+IEmXga6R9X5Idr02SF+P63WRVrrJ7QPr3q+4fLYST/nnrRL8SBf0cDYiOS/M5+NOPGJBW6ATg== X-Received: by 2002:a05:600c:5107:b0:43c:f8fc:f6a6 with SMTP id 5b1f17b1804b1-43d01bdbee7mr97383395e9.9.1741864515887; Thu, 13 Mar 2025 04:15:15 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:15 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:15:01 +0100 Message-ID: <20250313111505.166786-9-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 08/12] avcodec/sanm: codec21 decoder 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: similar to codec23, this one alternatingly skips and writes bytes. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 67963bb5d3..bf2ec40df4 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -614,6 +614,49 @@ static int old_codec23(SANMVideoContext *ctx, int top, int left, int width, return 0; } +static int old_codec21(SANMVideoContext *ctx, int top, int left, int width, + int height) +{ + const uint32_t maxpxo = ctx->height * ctx->pitch; + uint8_t *dst = (uint8_t *)ctx->frm0, c; + int i, j, k, pc, sk, pxoff; + + 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) < 2) + return AVERROR_INVALIDDATA; + j = bytestream2_get_le16u(&ctx->gb); + k -= 2; + if (sk) { + pxoff += j; + pc += j; + } else { + if (bytestream2_get_bytes_left(&ctx->gb) < (j + 1)) + return AVERROR_INVALIDDATA; + do { + c = bytestream2_get_byteu(&ctx->gb); + if (pxoff >=0 && pxoff < maxpxo) { + *(dst + pxoff) = c; + } + pxoff++; + pc++; + j--; + k--; + } while (j > -1); + } + sk ^= 1; + } + } + return 0; +} + static int old_codec1(SANMVideoContext *ctx, int top, int left, int width, int height, int opaque) { @@ -1384,6 +1427,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 21: + return old_codec21(ctx, top, left, w, h); case 23: return old_codec23(ctx, top, left, w, h, param, parm2); case 37: -- 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".