From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 84ABC4E6C0
for <ffmpegdev@gitmailbox.com>; Fri, 14 Mar 2025 00:08:18 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8D4A68E5C4;
Fri, 14 Mar 2025 02:08:14 +0200 (EET)
Received: from EUR03-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur03olkn2051.outbound.protection.outlook.com [40.92.57.51])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2B0D68C6C8
for <ffmpeg-devel@ffmpeg.org>; Fri, 14 Mar 2025 02:08:08 +0200 (EET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=D8LcqEXIJAKNdMp9CRUX2EsGOM7nCqSee+BZUFR1omf8Zu5KthDl7g6vlMpg8rdaoLtxyqS1sjN/f0ibqwDUFm42x2yHozkc1j1JIrjNPaOYP3n144zG4hCvf7ZwtVg7DUrtZNW8MDL18UpYHyN7F0EYZeBe4HatEOG6AkmATThWH4u8Ohq2Qjjn8n0+/6kxo/9dGotzJDyUhQXPv0wEtytXCm1J84biDuRdxZAoVxCnl6N1YqbY7+uCPrCYZMOpfOeqfDOak7dbCpQD8SFj2mQPSLzNbZYJcO0GtmVXtgFwgqvwEmecpMw1xCEy+FUXhK8W0vt43Hl6txQ0woS4aA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=NJ8Muo5+6YrUyGUmsZ1zEx0/v4wWVK52nrK5tjsRuCE=;
b=akkj3/AHYuYrb2uYFFZeGSzh6jFICWZ80SAHp+rAigRjDrgmeXoDQLB73p4kF2qihHO810qJUiD3l6At198iK4KrZ38wFXLHH7FzJ2hWdeqaGphKIhb/d5c0PI4Ly70TYOxEkRRaEeXjzztEEXJIadYN+968w9sp79XUQ27GYxXcnGs/SPWWPa6r0g47ghTWgBy0zdVrPLvNDpooc8AfZscuPmB7aBsJaxYhSLMs0/vKKXRAXBGGE8r0qCZImzOtc+s2KGfJBzNEWd3sCcFRS8F/uuoeKVZ0HCJtG1mMvJQxJQpHIQslNfIIASNzlgj+1Zg7FLC/jlo72jCqRYM1rw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=NJ8Muo5+6YrUyGUmsZ1zEx0/v4wWVK52nrK5tjsRuCE=;
b=FR5uXySO3CzQr4vCuTO9DL93kbkkstE0WS6ynS/IQMu9dKzhDcjSN82plhf1i3PCzV+VxxR6X9nSF33K7qSp0lJ3REhLt3xTKBXXhPEUILYOZusbtrtO7CM8HA5/JFOXXjcZOUQ+eK3gKuhaVQ5zCqC7p+oFAEnwfMOsyvc255rk7cYSt2TcZh9tOXVBSC1MfP/HCvKyVXYNl/llBh5+7Mv/4Pq7/VtsxpJPnWZ5eeRBqAFe0MKxa7iKsWkQQFAUYKeMsHBKG2eR/TaUgXEsKfrlKmdoyv2+xMCVwdRDnsIX5daoqI3TGf+9CQaKuRlNQkZQxxxiBxvaEanXWG4GTg==
Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14)
by AS8P250MB0364.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::12)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.25; Fri, 14 Mar
2025 00:08:07 +0000
Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
([fe80::384d:40d4:ecb7:1c9%5]) with mapi id 15.20.8534.024; Fri, 14 Mar 2025
00:08:07 +0000
Message-ID: <AS8P250MB074445C7E9131CD0EF200B7F8FD22@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Date: Fri, 14 Mar 2025 01:08:06 +0100
User-Agent: Mozilla Thunderbird
To: ffmpeg-devel@ffmpeg.org
References: <20250313111505.166786-1-manuel.lauss@gmail.com>
<20250313111505.166786-10-manuel.lauss@gmail.com>
Content-Language: en-US
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <20250313111505.166786-10-manuel.lauss@gmail.com>
X-ClientProxiedBy: FR4P281CA0418.DEUP281.PROD.OUTLOOK.COM
(2603:10a6:d10:d0::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
(2603:10a6:20b:541::14)
X-Microsoft-Original-Message-ID: <156e3466-37e0-4148-afaa-ff62c0f07f58@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0364:EE_
X-MS-Office365-Filtering-Correlation-Id: 52d861bc-b114-45c7-5fb0-08dd628c4c47
X-Microsoft-Antispam: BCL:0;
ARA:14566002|461199028|5072599009|19110799003|6090799003|15080799006|8060799006|7092599003|440099028|3412199025|41001999003;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?cmFmT0dWZkU1RFJjS0MxWmlLVk1GYWM2L3ZjVFFkVW9kQzh4NFVPR1VSVmM3?=
=?utf-8?B?dVVzZlRNeGFrRTg1YW8zSjMrNVpCWEYzS2cvYjMyeDdiTlplWlJva3hlWVd0?=
=?utf-8?B?a2lDOTdBcEZyclBlSUtEN1JmZDlmQXJ6YzZpcWVLWXZFaXZ2MGFqVTdlUXds?=
=?utf-8?B?R3JlUUNHVDNBN3pTcnlJUzcxTkk0VzYwUmE2a3ArUGJadmJ4Mllsd0J3bko1?=
=?utf-8?B?cU52L3hTZXdrMllucHQxS2NjbW5CZDNRVlA0YmpCdGg2VlEraTJGOVNLcXhS?=
=?utf-8?B?bkoxQXkzZXAySXd4WWxUcmZLVG1HaWlGM2lkOVRwSTVJSHl2UTY3NDAyTXVw?=
=?utf-8?B?TFd5YXdxdXdpZFZhTVBEeDE3cnZqUFgrUU9oM2pPeFZDNm5BNTUzazl2cDBZ?=
=?utf-8?B?OUE4OUFWaXJkMGs0bXJQYlNOS2ZLek9oMGNoOEE5MDlZMklLSEdxaDlsWVVz?=
=?utf-8?B?ak1tRjdYQ09Pa1p4RDhxdG1WTjFEY2RUQnkrSHhEREVVcVZoMUwyZTNhQTl5?=
=?utf-8?B?MTd2NHBsVkNTV01UOUdOOEtDb2tMb1h4TVh6aXpnREpuNDRkcHA5blFzK094?=
=?utf-8?B?MXY5cWU0dHR2b25pM2RDOUZvSHhuZ1VFWC9EUTJrM1Y2L2dXbWdlNUl4bzYr?=
=?utf-8?B?NWlWOTZXZGlpY2w0RnlhaTFjK2djS1MyTzc1Z2hJdlNkMS9oRXA5REduQzE3?=
=?utf-8?B?Wm5POGc2Rkl1N0Q0N0FTK2t4enBLWTRGQzl6SlpJSUpmeGdUTWEvT1Rmb0Iy?=
=?utf-8?B?dnhyRVV2akhIMXR2NXIxNUVmeUQydVB1Z0JueEtiMTJTWjZZWUE1R25uOERU?=
=?utf-8?B?OFd0S2U3YlZLTnpPdENEMEJUZ2R5cmJKdmRTU2JEVDd6alo0dTBpekNMWDdM?=
=?utf-8?B?Q3NRSjZCYktEZ29tT3pSRXUzNFFtM2RGNDZDWDBxQnNWVVNGUmlKamQrc21D?=
=?utf-8?B?b0hFUW5GaWhXSlRVRmpkZVJXZHZKVTIrQ25TblhIN2w1cUNNU3hOd0dqNTcw?=
=?utf-8?B?Qk56RitKSUk1N3VReWkzdHlsYlpmc1B6WndCQVRZWFVFUEVHWEx5aGwrWlds?=
=?utf-8?B?Y3A2M3R6bGtNNnFIRjBxNUFMT1ZZdUJkbWt2Q2tPSHcva0M4cyt2bFl4dTh5?=
=?utf-8?B?K0d1RmQvRFpRZkdKSHJ5c3E1TStQK0F6andRUEczcWxsRUFUOHZidjBhdWFy?=
=?utf-8?B?a3UyVjBjYmdtWit2U3YzMU9UejI4cEJ1STk5UmVrK0I0NVRLK3dXZHppNFZF?=
=?utf-8?B?MkFuNmE3RzdBV2E0eTFNUFQ1aXMrc0hxYmtFR3pHTktEN09Na0tpb2ZZT2M3?=
=?utf-8?B?ak4wVytmZFc0MkM5RlpvOXdkdVJ5NlB3enF0azNTUDI4VVFxVERhS1R2TzFE?=
=?utf-8?B?Mk9QbVhOMHcyWGxsSVArVVhmZlZyVnhEYmZKb2JGU2NnNjNqWjc4czJBMGtB?=
=?utf-8?B?R3d2TXpmNEV4NkhQUXBEdDUwV2pEeUtiMlJ3MG50NUJLSjdhbnFLeWxIcGhS?=
=?utf-8?B?eFNqR1RIYWJhdGZ0b1R4Z2hsM2FPVjlPVFZOQjBwSExlYkN4WklDMjE0MG1Q?=
=?utf-8?B?bk5Odz09?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dTZaK0JSV0RPUVJadXNMV0xVU3FPU0x0Ukl4aHpZOFFlbmg2c3dJU1k3dSti?=
=?utf-8?B?aG5PU3AwOVBpcGZYT3hCQzZCOGF4VGdqWm1kQklrTlJTc1dldk1tcTJBMENN?=
=?utf-8?B?ZlVDYmk0TUZtNkVydFVUSXFtUTdyMFBFQ3VOY2VXM2N4ekU5VVd0UWF1MllS?=
=?utf-8?B?TzJGd0lvZUVMS3N3UC8yUitYeFdTRHUzUmJ0VFlhbyt4eGdiYktjVVV6eC9C?=
=?utf-8?B?V3ZuRWhIWnlBbGhraVdDTFZwNTNGU2drc0pRVEkvY1lQNk55WkVzUEticE1X?=
=?utf-8?B?VngxQ00zczh5RDBaemUxME05MytLUjVMME9qL2lUclpET1hxckczZjhVa0VN?=
=?utf-8?B?WmFFcGd1UCtzZ21FMTl0YWx3YTRDUWgwL0l1blVuK3NzTU9pVmxTTTh5WE1I?=
=?utf-8?B?Rm4zYUZFOHNOV3JjL2tkTTBrKytKQ20yYlpMWWFhQzg0a1dJTUVjNXBsT2ti?=
=?utf-8?B?YUhqbHQyYnloVHY2Z0VrcDZXZlNFQjliZkF4M1lsdS82alRTOHVuS3Jmd0RG?=
=?utf-8?B?SEIvNUhETjVQVUdFSHpWR2dPV1hDUERVZ0x0dWliaEo0L0dpbkx6NFlWekZ6?=
=?utf-8?B?emJ6WFVuSzlZUE1WZTFHMHBjU0c0Nk9CeVFWRWRveXRMV01UcHdGZTBqb29X?=
=?utf-8?B?N3p1RXJtV0RhbHIvSGxETi84VTVTWGhNTUdRMStwZjVvcjJUakVBa1diWk5j?=
=?utf-8?B?UVdwc0FDdUd5WFVuZi9rMzR6QUpadGVUbUE5a2ZDUFFGM1IyVTVSNUp5Vmk5?=
=?utf-8?B?amJ0QXpDdVF0RkRPRzFmdDV6M0ZucmhNdDd3RXdheXZSTVJWcVRCYVZiRnJ4?=
=?utf-8?B?ZVZnbHhkdS9ZTG5QZjk0dWhJWmRaOWZqY1FWa1U3NXNFRVdkSis4anRkSHZL?=
=?utf-8?B?cXBNRlVBTHdUZHZqT3d2SmZ3bjFTRGZSL3JSa29ReXpVVzZxaXB5Z1V2YnVo?=
=?utf-8?B?Yk03amRRbWVCbllCb01sNm0wQXV4NTYvNitIVy93V05UZENlMmcwSXNWbDBJ?=
=?utf-8?B?K3Y1aDFaRGpMVXZjeVJiT1kvWDBQMktHa09MU0kwZ0J1YmNCNnZwdDk1NUVv?=
=?utf-8?B?c213ZTJCM015MkNCeFlzV3YvUWdmbHBJQVo1cVV6cjFWV1ljRlVUSUNnN2dO?=
=?utf-8?B?cUt3LzRWWXZkRjFXcFZSS1NrdG5JamphMEo1YS9GUmNkRUdDSkVudXNZOWRl?=
=?utf-8?B?QWFKUWlWSm9ieDFRYkQzUmkveS9tZ1hwVUhYdEh3enZyaGgyZkRIcWxRbTc1?=
=?utf-8?B?VVdDYUxZUGJzaVZDZUUwUmtHY2Ntb0wwQW1nRjVhN3JYMFZRQis5bXVxLzJ0?=
=?utf-8?B?Q3ozaVk3VDJsZEV3T3MxWnEvMmhpenBROGpvZlFEd2IxNnk4UDJsRHRJa3d4?=
=?utf-8?B?eU9pU0QwTjIyMHdQcURSYTFOVjZBR3FnREMzS3R0QjA0Y2c5YUFXZ00wREZ0?=
=?utf-8?B?SWtqODF2M1Y2RG5hdEZtTFdWclY0NUVBR3NUcXo4ZCtLdGZvd2NCejVtTkp6?=
=?utf-8?B?OU9EMWcyWVhpNzRPQkNGQTE1ZFJWNWs4VGdZQW5qUEhYVmM4VWEwRE9hMTNj?=
=?utf-8?B?WEx4N0xIbkJWZTFMR1dTRjNKdWV6T25wVlNqMEhmZXBjM0tpNnNubWFKdUlZ?=
=?utf-8?B?cWlUTmpNQWhoaEJMV3RGTWNuN0dGUW5aenRyRzFYZjdaanZYakhHcGtaMXps?=
=?utf-8?B?OStxN0dkTVN0eU5ENnk0bkIzcTVhY2h2dGNnRGRlVUlkSWREWXZaT3l3PT0=?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 52d861bc-b114-45c7-5fb0-08dd628c4c47
X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2025 00:08:07.4787 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0364
Subject: Re: [FFmpeg-devel] [PATCH 09/12] avcodec/sanm: codec4/5/33/34
decoder
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/AS8P250MB074445C7E9131CD0EF200B7F8FD22@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Manuel Lauss:
> This codec works on 4x4 pixel tiles, which can be generated and read
> from the datastream. They're both identical, codec5 misses a tile
> index to skip the current tile.
> Codecs33/34 are the same as 4/5 but with a different tileset generator.
> Used only in Rebel Assault 1.
>
> Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
> ---
> libavcodec/sanm.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 229 insertions(+)
>
> diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
> index bf2ec40df4..91c8ba658b 100644
> --- a/libavcodec/sanm.c
> +++ b/libavcodec/sanm.c
> @@ -293,6 +293,8 @@ typedef struct SANMVideoContext {
> int8_t p8x8glyphs[NGLYPHS][64];
> uint8_t c47itbl[0x10000];
> uint8_t c23lut[256];
> + uint8_t c4tbl[2][256][16];
> + uint16_t c4param;
> } SANMVideoContext;
>
> typedef struct SANMFrameHeader {
> @@ -480,6 +482,142 @@ static av_cold int init_buffers(SANMVideoContext *ctx)
> return 0;
> }
>
> +static void codec33_gen_tiles(SANMVideoContext *ctx, int8_t param1)
> +{
> + uint8_t *dst = &(ctx->c4tbl[0][0][0]);
> + int i, j, k, l, m, n, o, p;
> +
> + for (i = 0; i < 8; i++) {
> + for (k = 0; k < 8; k++) {
> + j = i + param1;
> + l = k + param1;
> + p = (j + k) / 2;
> + j = (j + p) / 2;
> + m = l / 2;
> + n = (i + param1);
> + o = (k + param1);
> +
> + *dst++ = p; *dst++ = p; *dst++ = j; *dst++ = n;
> + *dst++ = p; *dst++ = p; *dst++ = j; *dst++ = i;
> + *dst++ = m; *dst++ = m; *dst++ = p; *dst++ = j;
> + *dst++ = l; *dst++ = l; *dst++ = m; *dst++ = p;
> + }
> + }
> +
> + for (i = 0; i < 8; i++) {
> + for (k = 0; k < 8; k++) {
> + j = i + param1;
> + l = k + param1;
> + n = ((j + l) / 2);
> + m = ((l + n) / 2);
> +
> + *dst++ = j; *dst++ = j; *dst++ = j; *dst++ = j;
> + *dst++ = n; *dst++ = n; *dst++ = n; *dst++ = n;
> + *dst++ = m; *dst++ = m; *dst++ = m; *dst++ = m;
> + *dst++ = l; *dst++ = l; *dst++ = l; *dst++ = l;
> + }
> + }
> +
> + for (i = 0; i < 8; i++) {
> + for (k = 0; k < 8; k++) {
> + j = i + param1;
> + l = k + param1;
> + m = (j + l) / 2;
> + n = (j + m) / 2;
> + o = m / 2;
> + p = j & 0xff;
> +
> + *dst++ = p; *dst++ = p; *dst++ = n; *dst++ = m;
> + *dst++ = p; *dst++ = p; *dst++ = n; *dst++ = m;
> + *dst++ = n; *dst++ = n; *dst++ = m; *dst++ = o;
> + *dst++ = m; *dst++ = m; *dst++ = o; *dst++ = l;
> + }
> + }
> +
> + for (i = 0; i < 8; i++) {
> + for (k = 0; k < 8; k++) {
> + j = i + param1;
> + l = k + param1;
> + m = (j + l) / 2;
> + n = m / 2;
> +
> + *dst++ = j; *dst++ = m; *dst++ = n; *dst++ = l;
> + *dst++ = j; *dst++ = m; *dst++ = n; *dst++ = l;
> + *dst++ = j; *dst++ = m; *dst++ = n; *dst++ = l;
> + *dst++ = j; *dst++ = m; *dst++ = n; *dst++ = l;
> + }
> + }
> +}
> +
> +static void codec4_gen_tiles(SANMVideoContext *ctx, uint16_t param1)
> +{
> + uint8_t *dst = &(ctx->c4tbl[0][0][0]);
> + int i, j, k, l, m, n, o;
> +
> + for (i = 1; i < 16; i += 2) {
> + for (k = 0; k < 16; k++) {
> + j = i + param1;
> + l = k + param1;
> + m = (j + l) / 2;
> + n = (j + m) / 2;
> + o = (l + m) / 2;
> + if (j == m || l == m) {
> + *dst++ = l; *dst++ = j; *dst++ = l; *dst++ = j;
> + *dst++ = j; *dst++ = l; *dst++ = j; *dst++ = j;
> + *dst++ = l; *dst++ = j; *dst++ = l; *dst++ = j;
> + *dst++ = l; *dst++ = l; *dst++ = j; *dst++ = l;
> + } else {
> + *dst++ = m; *dst++ = m; *dst++ = n; *dst++ = j;
> + *dst++ = m; *dst++ = m; *dst++ = n; *dst++ = j;
> + *dst++ = o; *dst++ = o; *dst++ = m; *dst++ = n;
> + *dst++ = l; *dst++ = l; *dst++ = o; *dst++ = m;
> + }
> + }
> + }
> +
> + for (i = 0; i < 16; i += 2) {
> + for (k = 0; k < 16; k++) {
> + j = i + param1;
> + l = k + param1;
> + m = (j + l) / 2;
> + n = (j + m) / 2;
> + o = (l + m) / 2;
> + if (m == j || m == l) {
> + *dst++ = j; *dst++ = j; *dst++ = l; *dst++ = j;
> + *dst++ = j; *dst++ = j; *dst++ = j; *dst++ = l;
> + *dst++ = l; *dst++ = j; *dst++ = l; *dst++ = l;
> + *dst++ = j; *dst++ = l; *dst++ = j; *dst++ = l;
> + } else {
> + *dst++ = j; *dst++ = j; *dst++ = n; *dst++ = m;
> + *dst++ = j; *dst++ = j; *dst++ = n; *dst++ = m;
> + *dst++ = n; *dst++ = n; *dst++ = m; *dst++ = o;
> + *dst++ = m; *dst++ = m; *dst++ = o; *dst++ = l;
> + }
> + }
> + }
> +}
> +
> +
> +static int codec4_load_tiles(SANMVideoContext *ctx, uint16_t param2, uint8_t clr)
> +{
> + uint8_t c, *dst = (uint8_t *)&(ctx->c4tbl[1][0][0]);
> + uint32_t loop = param2 * 8;
> +
> + if (param2 > 256)
> + return AVERROR_INVALIDDATA;
> +
> + if (bytestream2_get_bytes_left(&ctx->gb) < loop)
> + return AVERROR_INVALIDDATA;
> +
> + while (loop--) {
> + c = bytestream2_get_byteu(&ctx->gb);
> + *dst++ = (c >> 4) + clr;
> + *dst++ = (c & 0xf) + clr;
> + }
> +
> + return 0;
> +}
> +
> static void rotate_bufs(SANMVideoContext *ctx, int rotate_code)
> {
> if (rotate_code == 2)
> @@ -519,6 +657,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
> if (ctx->subversion < 2)
> ctx->pal[0] = 0xFFU << 24;
> }
> + ctx->c4param = 0xffff;
>
> return 0;
> }
> @@ -532,6 +671,91 @@ static av_cold int decode_end(AVCodecContext *avctx)
> return 0;
> }
>
> +static int old_codec4(SANMVideoContext *ctx, int left, int top, int w, int h,
> + uint8_t param, uint16_t param2, int codec)
> +{
> + const uint16_t p = ctx->pitch;
> + const uint32_t maxpxo = ctx->height * p;
> + uint8_t mask, bits, idx, *gs, *dst = (uint8_t *)ctx->frm0;
> + int i, j, k, l, bit, ret;
> + int32_t pxoff, pxo2;
> +
> + if (ctx->c4param != param) {
> + if (codec > 32)
> + codec33_gen_tiles(ctx, param);
> + else
> + codec4_gen_tiles(ctx, param);
> + ctx->c4param = param;
> + }
> + if (param2 > 0) {
> + ret = codec4_load_tiles(ctx, param2, param);
> + if (ret)
> + return ret;
> + }
> +
> + if (codec > 32)
> + codec -= 29;
> +
> + for (j = 0; j < w; j += 4) {
Why don't you use loop-scope for iterators?
> + mask = bits = 0;
> + for (i = 0; i < h; i += 4) {
> + pxoff = j + left + ((top + i) * p);
> + if (param2 > 0) {
> + if (bits == 0) {
> + if (bytestream2_get_bytes_left(&ctx->gb) < 1)
> + return AVERROR_INVALIDDATA;
> + mask = bytestream2_get_byteu(&ctx->gb);
> + bits = 8;
> + }
> + bit = !!(mask & 0x80);
> + mask <<= 1;
> + bits--;
> + } else {
> + bit = 0;
> + }
> +
> + if (bytestream2_get_bytes_left(&ctx->gb) < 1)
> + return AVERROR_INVALIDDATA;
> + idx = bytestream2_get_byteu(&ctx->gb);
> + if ((bit == 0) && (idx == 0x80) && (codec != 5))
> + continue;
> +
> + gs = &(ctx->c4tbl[bit][idx][0]);
> + pxo2 = pxoff;
> + for (k = 0; k < 4; k++) {
> + for (l = 0; l < 4; l++) {
> + if (pxo2 >= 0 && pxo2 < maxpxo) {
> + *(dst + pxo2) = *gs;
> + }
> + gs++;
> + pxo2++;
> + }
> + pxo2 = pxo2 - 4 + p;
> + }
> +
> + /* smooth top and left block borders with neighbours */
> + if (((pxoff - p + k) < 0) || ((pxoff - p + k) >= maxpxo)
> + || ((pxoff + 3 * p) < 0) || ((pxoff + 3 * p) >= maxpxo)
> + || (i == 0) || (j == 0))
> + continue;
> + if (param & 0x80) {
> + for (k = 0; k < 4; k++)
> + *(dst + pxoff + k) = ((*(dst + pxoff + k) + *(dst + pxoff - p + k)) >> 1) | 0x80;
> + *(dst + pxoff + 1 * p) = (*(dst + pxoff + 1 * p) + *(dst + pxoff + 1 * p - 1)) >> 1 | 0x80;
> + *(dst + pxoff + 2 * p) = (*(dst + pxoff + 2 * p) + *(dst + pxoff + 2 * p - 1)) >> 1 | 0x80;
> + *(dst + pxoff + 3 * p) = (*(dst + pxoff + 3 * p) + *(dst + pxoff + 3 * p - 1)) >> 1 | 0x80;
> + } else {
> + for (k = 0; k < 4; k++)
> + *(dst + pxoff + k) = ((*(dst + pxoff + k) + *(dst + pxoff - p + k)) >> 1) & 0x7f;
> + *(dst + pxoff + 1 * p) = (*(dst + pxoff + 1 * p) + *(dst + pxoff + 1 * p - 1)) >> 1;
> + *(dst + pxoff + 2 * p) = (*(dst + pxoff + 2 * p) + *(dst + pxoff + 2 * p - 1)) >> 1;
> + *(dst + pxoff + 3 * p) = (*(dst + pxoff + 3 * p) + *(dst + pxoff + 3 * p - 1)) >> 1;
> + }
> + }
> + }
> + return 0;
> +}
> +
> static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size)
> {
> int opcode, color, run_len, left = out_size;
> @@ -1427,6 +1651,11 @@ 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 4:
> + case 5:
> + case 33:
> + case 34:
> + return old_codec4(ctx, top, left, w, h, param, parm2, codec);
> case 21:
> return old_codec21(ctx, top, left, w, h);
> case 23:
_______________________________________________
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".