From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 117574D065 for ; Fri, 30 May 2025 11:19:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C70FB68DC1E; Fri, 30 May 2025 14:19:16 +0300 (EEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id DF84768DC09 for ; Fri, 30 May 2025 14:19:07 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so23090605e9.3 for ; Fri, 30 May 2025 04:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748603947; x=1749208747; 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=Wq4LIInpjD7dPEe6A2jqYW1zldA7THkiyRtIXSRzW/U=; b=XtruPFD0J5iAmxA46dNhMskqu8CRXokAne8Mb6m3AnaPYZ3ulWTn6hTIFeH8fDsb5B WQc6yQDpI0M9LGOWSdGRL3hyZkcqQiFDnFD0k/cqAt3QIETFeZUj7k8ALXFU3vwIP4y6 inrjOMCC+MZ5wdteuofV/8oauq6Z4USTmVhPi1WEt8kaYm03jDHOFh9hJWFVAM9A21QN uXH8py+b366nXb2w4iOryttxsGKovXBzn3mQJ07j8+iMWvLTy3wyp98u1aHhfrKeyn4C wXDP48pWCug5do/oW3wjJFVe+E6Uapqo+JI1aABM1oBkptX9JX7es2clmvSOlF+diAiK lXKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748603947; x=1749208747; 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=Wq4LIInpjD7dPEe6A2jqYW1zldA7THkiyRtIXSRzW/U=; b=Jy4LY6sWJUYBBXhBDdHYBgz7T3spJWqCA0/Yd3tc2pTMkhiSpVLkTYK+Xg+hTXZRIb zdPoWkKrJJd4tKtoQSa5Uay4CLdh/bbUBNQrah9yv58WB6n/rCJtOGcSE4ILYSOrLIfA EG0PBA8KZHrY9oIXlXZL4yADM9wpeayTY50JdyBKzouQDCfu+qXNSRSF252FlG//tXH+ zrB6nMlI1YGuvSa4avWuyVDLC1xSfQBLUutKdq9cUQt+Lmd9SiOYN4ezcInxfZavCUYF L9RNF2dbUGsms/+EHJWEfVLRH++PfG7bsIjiLkBJeuLomxUVIkgZ2aQ4CyEIafMqMBWO 9qdw== X-Gm-Message-State: AOJu0YxMg9UwaOB+aNIgVOXlY38LPseaYiFBQafjkmwZxR+T4KAb+fP0 vAPFKk8TVkdC7ojkk6jYdtd9ubQHyjqyTtQDIoj2bg9FZ5YyxmIwC0vaM3thOA== X-Gm-Gg: ASbGncuLGdPpqSL3YrZr6x6goKrvkMNGGnYkHFD1GeRDl9RPzjL+qLtUm5UyH+tUdeZ emPidcaBj4pp4m2s0FK+h1zYsnE1x1wpqBvi+KWxS8JsrRyyhJoUk8eRhs4YdL3E15RS4nfN3tJ DwHXnaTvu+KgukQr3HEb9z/XzTx/mh3DvZ7KEUYQrT5Lbv+YOTaRkW19Rt3BE5DnliAnjmQx0fx wjWaNjaH3yJRUbfYKrNkSzmrZJRjE2h78J26uqHTNWp3hTwlJSZjrrr3iA1NKoPscw0ByekGddG LyJrsQuBpGJn6mGtqGUF9jLPvUU9NpERgfglLYixcyG6EJbrIJC8ZgsVinVOzWsarPDOSNP0+kW E3wrunKslShu8hArv2+ipbEs/UWwWRRSR92Q1R16WytYli2EQhJOqkepB2IEMfQ== X-Google-Smtp-Source: AGHT+IEjn8N1dfg1rydssTBspDSq9TnGjjygz/ww6hHZ7AFonSjfYOYRCyiQ+eSZu+YSnwb9ULK3Eg== X-Received: by 2002:a05:600c:45cc:b0:44d:a244:4983 with SMTP id 5b1f17b1804b1-450d87fd9bemr20354795e9.3.1748603947042; Fri, 30 May 2025 04:19:07 -0700 (PDT) Received: from flagship3.deu.mlau.at (p200300c0274587009021970c90ca1b51.dip0.t-ipconnect.de. [2003:c0:2745:8700:9021:970c:90ca:1b51]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe754acsm4605530f8f.59.2025.05.30.04.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 04:19:06 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 May 2025 13:19:03 +0200 Message-ID: <20250530111903.51777-3-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530111903.51777-1-manuel.lauss@gmail.com> References: <20250530111903.51777-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/sanm: codec31/32 (SEGA-CD) support 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: codec31/32 are like codec1/3 (RLE coding) but with 2 4-bit pixels per byte. --- libavcodec/sanm.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 46cad3c703..975f33992f 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -928,6 +928,62 @@ static int old_codec1(SANMVideoContext *ctx, GetByteContext *gb, int top, return 0; } +static int old_codec31(SANMVideoContext *ctx, GetByteContext *gb, int top, + int left, int width, int height, int p1, int opaque) +{ + int i, j, len, flag, code, val, end, pxoff; + const int maxpxo = ctx->height * ctx->pitch; + uint8_t *dst = (uint8_t *)ctx->fbuf; + + for (i = 0; i < height; i++) { + if (bytestream2_get_bytes_left(gb) < 2) + return AVERROR_INVALIDDATA; + + len = bytestream2_get_le16u(gb); + end = bytestream2_tell(gb) + len; + + pxoff = left + ((top + i) * ctx->pitch); + while (bytestream2_tell(gb) < end) { + if (bytestream2_get_bytes_left(gb) < 2) + return AVERROR_INVALIDDATA; + + code = bytestream2_get_byteu(gb); + flag = code & 1; + code = (code >> 1) + 1; + if (flag) { + val = bytestream2_get_byteu(gb); + for (j = 0; j < code; j++) { + if ((0 != (val & 0xf)) || opaque) { + if (pxoff >= 0 && pxoff < maxpxo) + *(dst + pxoff) = p1 + (val & 0xf); + } + pxoff++; + if ((0 != (val >> 4)) || opaque) { + if (pxoff >= 0 && pxoff < maxpxo) + *(dst + pxoff) = p1 + (val >> 4); + } + pxoff++; + } + } else { + if (bytestream2_get_bytes_left(gb) < code) + return AVERROR_INVALIDDATA; + for (j = 0; j < code; j++) { + val = bytestream2_get_byteu(gb); + if ((pxoff >= 0) && (pxoff < maxpxo) && ((0 != (val & 0xf)) || opaque)) + *(dst + pxoff) = p1 + (val & 0xf); + pxoff++; + if ((pxoff >= 0) && (pxoff < maxpxo) && ((0 != (val >> 4)) || opaque)) + *(dst + pxoff) = p1 + (val >> 4); + pxoff++; + } + } + } + } + ctx->rotate_code = 0; + + return 0; +} + static int old_codec2(SANMVideoContext *ctx, GetByteContext *gb, int top, int left, int width, int height) { @@ -1708,6 +1764,9 @@ static int process_frame_obj(SANMVideoContext *ctx, GetByteContext *gb) return old_codec21(ctx, gb, top, left, w, h); case 23: return old_codec23(ctx, gb, top, left, w, h, param, parm2); + case 31: + case 32: + return old_codec31(ctx, gb, top, left, w, h, param, (codec == 32)); case 37: ret = old_codec37(ctx, w, h); break; case 45: -- 2.49.0 _______________________________________________ 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".