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 DA50F4E45A for ; Tue, 11 Mar 2025 15:05:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDB9168E15E; Tue, 11 Mar 2025 17:04:07 +0200 (EET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0349568E123 for ; Tue, 11 Mar 2025 17:03:56 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43690d4605dso34907885e9.0 for ; Tue, 11 Mar 2025 08:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741705435; x=1742310235; 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=BrVwDXQZtoRSmJwQHPjC8aVTll1z3UhEvmDqAhcPQ6g=; b=XbYQWUBGswL00knI/i0LeLE52MQJvouxsG/91Lo6mnfqnB6swld9FZxPKiGACgh2sG KIzuqBVpSbFwmpr+y8v+qeWrNeA91iqd3v2d+w0+G0ZorsX/I8o6LDoIfJxvM7trDZdW tHt5OzkRMRM/ASy4BOC1l5l27x3UQ1sW8NeeTABMtY/HdGhV51i+1FqMtQTr05+R4HS3 /XV8oxzZa+QOEZfgWNi9FuZ2TaIUMsYZQdwPylhwWT/oqkG/8uVIjNvX9sx/UyGGGuqI Ua9G9kjVCueg0FFaA9LF9ZqN1UNORuk5jdscXEYEW5BSLy7m57J1kWEKtEGO1XHdAGRN ++Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741705435; x=1742310235; 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=BrVwDXQZtoRSmJwQHPjC8aVTll1z3UhEvmDqAhcPQ6g=; b=Lx9ZjgMSxzmw1340sxvEyMIkYg11CR2SE29Ixqmg10APtdW+YL7VQApIOHdpgnJtJr Rw2KPk1hHtatLVHZZoAbwY3klwPSmVRBwe0UunpZy3JH2dwUfaszqSe9+ma86Q4cd+jN 2kkQvpuOsHywP/0MBUV7QHn28dnBa0iAcrJVOCHmglIPALHonlSKhbkAu4K/7NQWtvmc i/QxYNEu+iHl+NOZYSpsIED9KZ0q94kvGw6o+y+7r9FLPzc4RxU6TnS3F9ySg4SoKY2y bS1n/RIL9zBlnZ3t8fndcsHrMZ8cVE6LUQek1RWIlueO9g5MaPNMzn29XZnxiMmnbEL3 IOhQ== X-Gm-Message-State: AOJu0Yzfju8ePB2UvW5SB5tFKuVdRdf9zcSp7iOsHNuJNPe9HJzYN03T BHKClDmem5JEnEgXkgtpRvQ+pca9CU1daOADg1TZ0uqIoG9PQG99mXFcDg== X-Gm-Gg: ASbGnctIyeCKqZ2YZyhRLCgDAj3+yKK1H6/RuIlenN0ApUQ/7pVoIBRuc5p8J7HrZyu 2782kgwTLaMWdPLImYSdIOJ3nIY4l/pWmOp+ym2Eo71sC02bZL9ngaE3+LtiHtCe0+jzJJ6+8Jq 7/WED0vMrNR5K1difyuNS7DUQ+P/pEhd7pHPPzJDcBb13nuG23Q8EvBL1zpn7xvyY8BjvtBRXbe Cj2PyPd4XNHrsMLpmP/UlYv4b0sbsuQcicdd4vpB1d0KZUE13o+mNvp1G2s1CxOfKpxtJz2B1k4 D/Zkp3fL7GY78zRel1cfDzsUaHGUAbvtFkF/MDdDSIevthRxN946GNM6WcLKG4pH4NM2Q6JwJGT BfacV3KBsmF/kiI2jSb47A1hDfasxP+i7z51cCzk0AFnJnchx+36zQJY= X-Google-Smtp-Source: AGHT+IEZ4KHFOesw50SBe8ZGh4goTwTWBbGFQHyfHYMn3DhXxLSFU6Hm6EypF4PztkpGgQrfH76nOg== X-Received: by 2002:a5d:64e9:0:b0:391:4873:7943 with SMTP id ffacd0b85a97d-39148737af1mr8980702f8f.32.1741705434822; Tue, 11 Mar 2025 08:03:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 08:03:53 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Mar 2025 16:03:41 +0100 Message-ID: <20250311150341.348678-9-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 9/9] 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 dbd78de0bc..edce76c7f4 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -612,6 +612,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) { @@ -1383,6 +1426,8 @@ static int process_frame_obj(SANMVideoContext *ctx) return old_codec1(ctx, top, left, w, h, codec != 1); 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".