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 ESMTP id EE95B48660 for ; Sat, 13 Jan 2024 02:33:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9B5E68CEC1; Sat, 13 Jan 2024 04:32:58 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2FDC68CA86 for ; Sat, 13 Jan 2024 04:32:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AxivmStMnQDcS21p7ZjQw7HjBWZ5xsc6fMLW9A6emIr0SyJ0ucUboikCq+WPVxp0XLUgQ616jlZBmnBCQSKYk2DjjE9ZrfCz6b6L4LUPqC1FPbBc8pW9O5SoZIX0SHql1bXPtMH09ziM7inkwg6Qj1DRpB13MJBR7L+MdSJW0tXnxvpn/q/CQx4BcX9PfKndUU6XVPYDYib7ZU8F5CMFrCs6AnSPYrDR1gv/0ilC0/kA1VYpR3OvFo7fKZVSqrXHyx6DqnsRFmmTyvzVcYATjyZ97HdVqNLOIN/6q8Kbq0zVGsZXNteRXkLhL38oy17xauG3UsEX9UXDtDAyMm6OFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Mf6JaV9bxeMmi9TxUGcYDXhfbmsKP9/HJk87zTlMGhc=; b=C2PFhWMnW7OmRJe+8/st3KficwFTRJgehZjqR9MBPMIbm6kjfaZqk1ngFOvDgzMBLkyBd6IM4KwrXoZfaNIj8IOvXa1uapEvUiYCAwuRVSu8YHgSdETTg5xej4o/IaOn0I/XxMBrzlgKPeGttTITNMAycETjr1FIOzFOEsxXKw7W7oLFKGEurRiQTZNv736w6SMVQXkVnQ46HM4935gCfkCCA4mcKISqpMjQBpc+5ZG/74WhJcr+vsElNLbDCRcGNXj9g7Y27UuU2R99HouweLGGsOg4PG3TWeBdLvZCvQypudsRkypg2QcQxlCcLBvcDOdwpxyPDjmzbS2rPmpJ1A== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mf6JaV9bxeMmi9TxUGcYDXhfbmsKP9/HJk87zTlMGhc=; b=IzLrPRHjVwYcmfwXhghyeyveCnigODPZVSnuxYpAQ0lGCG2y/TDuVkImMI+eioShVR4cb6WCyWVmjnXvQ194JweCLv6kDP8jzW7+KsGo7yjTdE3sWiIB2XDnxCK7xnreE8CU1PmRQ82dasmvw7RvwTHl1pczHRbxcns1kwI/Ns6aYNYM80M8g8SNm2sUUlru3QuwDyL+G/+vb5pCMG7toaE0Cf3hgJxMM951J+bj7F59I+vUVsT7XGC6boEKHuj5iHh/Jb/A+ZUdpJR863W3s1A10oo9qyt84v4B+5moKwrm1ZLNyYhZtMCT3ExOSVKu7lSSLzJACZ+7Jkse57EqcQ== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by AS8PR08MB8252.eurprd08.prod.outlook.com (2603:10a6:20b:53c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Sat, 13 Jan 2024 02:32:51 +0000 Received: from PAVPR08MB9795.eurprd08.prod.outlook.com ([fe80::83f1:da95:eae9:6b96]) by PAVPR08MB9795.eurprd08.prod.outlook.com ([fe80::83f1:da95:eae9:6b96%7]) with mapi id 15.20.7181.015; Sat, 13 Jan 2024 02:32:51 +0000 From: aybe aybe To: FFmpeg development discussions and patches Thread-Topic: Re[2]: [FFmpeg-devel] [PATCH 1/4] avcodec/mdec: DC reading for STRv1 is like STRv2 Thread-Index: AQHaPSZMtE+axwsvBUa1gdglXk5Ai7DSYaqAgAS1nwA= Date: Sat, 13 Jan 2024 02:32:50 +0000 Message-ID: References: <20240110023741.GP6420@pb2> In-Reply-To: <20240110023741.GP6420@pb2> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [9cf6pQ6XB2eYnDwSLiRSB1N3XJEfRZJLvRBCVRVQaOQpQ2k2fL/rfQ==] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|AS8PR08MB8252:EE_ x-ms-office365-filtering-correlation-id: ad544c10-aad6-47cd-b089-08dc13dff043 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jbteomLjq1TmcD6vgI+HFmdELbDEqSCOrayvf577GH7PBBNkWdSBCqXAOALqgbUEp51CsNqg6C7R92k4k4lLriy5/UCOOiIW4JIsWmAj8y+MAnfafCrwtETkTDNAt7p90yo5Or/e0cS+jX6pMhZSKkTkyxt4iH1X9onhyuGSk8UmNhpnIG7fgbfh7wJ4HekXtVO3/bqX3k/3fNbWDHP0d4HZOWhGwDxc7InPpV/SsmYWvthQY3R5pB3A8bud0CaWnED7rxgZ2LfiB5J51CFnPCs6S5JBWlG3mQcV5GxfdIzYmEfhDjU89p5L9sBmp7h8eVOttI+bjY8MCaxZ/qnPOlpulB5FY22WaNu1ayGT7DQxBQhpmGSy2meeA2JwPS1Oap6aqnMY3XS8262VqqepBCRgkw7peTsZbRk5uNMEUDd51tqqspEXuYKaW9Mnogj3LJRX+Ihl5YKyIezpMNzeWfqO3MH7Lbriv48EL5r2UrnTcAaqHuEp2ohYjHDigncOf78p6Jt0cHTlk9V6LnzMDxT6kOG+b5wsMccqsrHYD9tASwsqSlaknVKekfdWXuD0 x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?WWxKNG5ZbTZmYWhsZVRmVC9WVzVoRWpyWlUwVHJoYlozL0M3M2FrVVhoWng0?= =?utf-8?B?MERYZHBnWis1MXdrL1ducTRBR1R2aE42ajR1ektpTjNZTHBDVjgzUmp1Qk9X?= =?utf-8?B?cmwwK3FZMlBSVENYeGxUa0tRWXMyL3pKaURFVGZZME40TmtjaXNlMm9KWHI5?= =?utf-8?B?ZmJSKzdpY0FDV3pDQjdUd3JaMFYwTlV4T0pPTUx5dTNUVkROZGgvS1JqUTdB?= =?utf-8?B?V3luY2hLc2hhWlF2c3VRWjZIL3pQSmdqZ0o4R1FLYkUyTFp4Qi80OHRsTzdw?= =?utf-8?B?V1psOUdhdkh2clExRGk3ZmlFOTAyclRJSmFIS1FmTndkbzNnenRZT2N0WEhN?= =?utf-8?B?R2UwSTdaYXZwT0FiWVpKeFhCLzA2Y0pyeFBsc2ZRWTlCOSt6MG00RzRFeFBB?= =?utf-8?B?TUFtNHBCbG5ZL1NEUUhDM0o1NHM5WU4xNklsNXlCakpzdDlXSkhFSlVYOFpK?= =?utf-8?B?em1pckRoWnc1MGNibmd3UlNRM0VHR1lIMXl6Nko4Q0o4OWh5bmhnR0M5bjdJ?= =?utf-8?B?Rms5UmtIUjF5N01OZHptN1l2Y2U3YTUvVEhuZmdyVmYxR0lrSmVCSnJ4U0tY?= =?utf-8?B?Vk9rV3lRMFlxYWV3YkFka3lpcS9aaTJkekc4cFZJaFhZSTc1RW1DM253eEJS?= =?utf-8?B?ZDFyVHdUY3RNTVYveU4yekVKTERUQ0lkZjRtSVZ1MHk5ZGVia1daYW4zUlZW?= =?utf-8?B?eEk1VUppN2N1ZU9pdndxMU1iT0JJeUx5L3NieDlGRnl4bElSenFSRGZ0OE9P?= =?utf-8?B?L3NHNGxtQW1FaVRPREU3S2ZRRkxlUHNRWlJ4WVVXMzlKZmI3RUI5TDdmZHdK?= =?utf-8?B?SnA4dUVpOElqV2xYbTJjUmd0RU0zZlpjeldRU3Y0c2o5T3FmQ3c4OXppWHp0?= =?utf-8?B?aDRZY0MybVJoaTNkNWpLNDU4RWttSjNxd1I0RHhkZ0VnczNERTI4aWN1NTY4?= =?utf-8?B?VVZ5ZVZnZTl3S29SWWZqV0t1K1E4NEZla1NsN1BmaWtGUWttdGhPMTJzWUN3?= =?utf-8?B?Zk9tRzZTNmdZK2cwUnR3NiszcEF6YzhBb2Vud2pWSUhZNXp2VUhQTGNIMGJW?= =?utf-8?B?aXdLd3BJSjVqUE42SlEzKzE3TVZsM2drMlZ6KzdxWVBtMFMyQ212ZW9vR2lB?= =?utf-8?B?RzkzL3YycUczRFJTV0IxUzA5aDQzcUJUc3FpYkpjNk1hcXR2Z25PaDdjOGFn?= =?utf-8?B?SStpYXVlTWhETDFDTHF2THIyUjVUTlZHbElvZTlQR0lRVElMNC9WU0lCY3Ir?= =?utf-8?B?YjJKSXYyYUhGT0ZqcU5BcFNOcEI4d0w5dEZxT0N0UzY3eHAxeFpIVXBEa0pW?= =?utf-8?B?U2RhOEYxaUltYmZHalRRSWlZL3QyR282SUt1b2xoNk5NUTg3UnZDWEFGZHNl?= =?utf-8?B?YnFpd0JERTFjUmptUFptRUVxazQrdUZUbkc5R291MEV2TjJHc3RpelZSdGF2?= =?utf-8?B?bE0ySTNmcWh2YlRHOStvMU52MWlhbXdBaDEwaWsyOUNVeXVqZTNBMGxKQ3Y2?= =?utf-8?B?Z3g3eG4rRmtWQ2pUUFFkWU5KOU81Mlp6OVFFZ3ZodTdpeStzZ3pMSG1hV3pC?= =?utf-8?B?MEVZaGpaVE1WS01PYW00Y29IMkx4WTBheU03WFdyY3I2UTZMY0xuaHdVUUY3?= =?utf-8?B?cVpuRkZ1TGpsWDNSRzhRbWxrZjFieklqaTQvS3UxL21nNTVZb05aTG9FOC83?= =?utf-8?Q?E9zWYX+ibkNdgtpW+8b2?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-37dd7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR08MB9795.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ad544c10-aad6-47cd-b089-08dc13dff043 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2024 02:32:50.9345 (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: AS8PR08MB8252 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH 1/4] avcodec/mdec: DC reading for STRv1 is like STRv2 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 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: I'm afraid I can't tell, I checked the commits before creating patches out of them; they did not appear to have superfluous whitespace in them. ------ Original Message ------ >From "Michael Niedermayer" > To "FFmpeg development discussions and patches" > Date 1/10/2024 3:37:41 AM Subject Re: [FFmpeg-devel] [PATCH 1/4] avcodec/mdec: DC reading for STRv1 is like STRv2 On Tue, Jan 02, 2024 at 02:49:26AM +0000, aybe aybe wrote: Hi, As I understand, support for .STR files is broken for almost 10 years now (since 161442ff2c4b0dd8a5072c6bbe6bf55303fffccf it seems). Currently, ffmpeg fails with tons of errors like this on version 1 STRs, e.g. Wipeout 1: [mdec @ 00000000027c72c0] ac-tex damaged at 1 9 What happens is that only the audio is present in the video file. Anyway, that one character patch fixes the problem, video is now rendered. Signed-off-by: aybe > --- libavcodec/mdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 44b12471a9..c4904216b8 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -68,7 +68,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) const int qscale = a->qscale; /* DC coefficient */ - if (a->version == 2) { + if (a->version <= 2) { block[0] = 2 * get_sbits(&a->gb, 10) + 1024; } else { component = (n <= 3 ? 0 : n - 4 + 1); -- 2.41.0.windows.1 This is how the patch should look: (there are differencs in the whitespace which git seems to have problems with in above) not sure where these differences came from thx diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 44b12471a9e..c4904216b81 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -68,7 +68,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) const int qscale = a->qscale; /* DC coefficient */ - if (a->version == 2) { + if (a->version <= 2) { block[0] = 2 * get_sbits(&a->gb, 10) + 1024; } else { component = (n <= 3 ? 0 : n - 4 + 1); [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you think the mosad wants you dead since a long time then you are either wrong or dead since a long time. _______________________________________________ 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".