From patchwork Tue Jan 2 02:49:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aybe aybe X-Patchwork-Id: 45451 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6485221pzh; Mon, 1 Jan 2024 18:49:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjclX/yFe8b2Sm7oup/kJOnnERb+11lfVzS6kaYsMaRXVjb8SQDvPpePjU5BJ88WgaPLN/ X-Received: by 2002:a17:907:2ceb:b0:a27:c465:343d with SMTP id hz11-20020a1709072ceb00b00a27c465343dmr1297381ejc.135.1704163781403; Mon, 01 Jan 2024 18:49:41 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yr5-20020a170907334500b00a233627daa3si1472675ejb.726.2024.01.01.18.49.40; Mon, 01 Jan 2024 18:49:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=cCpug6nN; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADAE668C66F; Tue, 2 Jan 2024 04:49:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2099.outbound.protection.outlook.com [40.92.65.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49B8068C66F for ; Tue, 2 Jan 2024 04:49:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zmh2IJNtr8O/SmV1ans+0aNHLCHRoeKjmubgT/5b6Ieyb+uKkWlogkxwsiJQb1NyNOiEAYtBx6GpB5GxQoPaQG3pTXuqiSAzlhMCd5Ssj2qBtrWzCRzuoSZT3PfkRwVnl5qLSX9VLl7FwyaDXK/WLxwFun4andgVP6dBctLnKqrbVVt/y98zBV+QbRAkzObOzP9yeGb59Y4ImHcBB9WnQ2sZTCX4YLxw/ujmTXibqiajS1LAYPIB990NCzH2RfPwZq3Jl8d6jg3jdqqvaoZF517ZejFFy9zEA1IR+XMEECMEX/YrxFcv+xvPKQTaTu2+o0IL8dWnkZ65cL/qhaHsyw== 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=CyQocmiCawWejEF9cTRuRwqGot3WCadFkt5mqCEm9Qg=; b=cO4n8jXIqyy2YrA5B7yMWXc0BGRi090ZOCY0kG47Cxs94Q4gNxur8ZU5BxvOEkzUQujUcU9st2s0CYyvkIqYc8nA9pev1tK6RYI4Q3qqLTkl2gpXHFB5OViluF3dytE4J/yi89dYexetkTg+Aa8d9FzBsxOkqo70+MWYjk/DtfW+/0hEZ8YdO2KpDvXVsY3a0Q91T0MeNmHiSKVEsZ+0JWp3TiusyCzVusuBmWN+0+d2gK9xY0D6xLd+QG8bH1NW+kO08boqlov9JEjaqAXftBSw8cuiZBo4/Y3W4Yn3VEgKR+5mPmVCUhVbw+rFb47c8oVX2SFR0Q+VMKHHsyGM/w== 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=CyQocmiCawWejEF9cTRuRwqGot3WCadFkt5mqCEm9Qg=; b=cCpug6nNSlJr9GhfoNEvTCo87UZOvtiWDk7g1ktLFHdZpjqG485n9VwAjrbA+BLPez7x2vYfyfpycj9wOnwyeEQS9KVeeIv0qeIfROlJz3zuSJ6YYPxyv1hJnMLU/aNvxCNAU1v5y2CQQV7tMzD7i0dSAOlqkXGOsQNi6stlp61Yrs4tK6SDwNfF88XxC8c8wfRJGZLHfg7i6XY540fYduGDrTKe67kRZcdeIn8zILIVYY4v8G96VGUMXPLeTfuKo2grbYJ7hvm2R5DFhQXnm9ARSUOy/+KXQOKUZOfodVNBUKAaJJ6yspo7pQ0e7qpwXxID5XSo+fQ4GCor2TX5Cg== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by GV2PR08MB9374.eurprd08.prod.outlook.com (2603:10a6:150:d0::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.24; Tue, 2 Jan 2024 02:49:27 +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.7135.023; Tue, 2 Jan 2024 02:49:27 +0000 From: aybe aybe To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/4] avcodec/mdec: DC reading for STRv1 is like STRv2 Thread-Index: AQHaPSZMtE+axwsvBUa1gdglXk5Aiw== Date: Tue, 2 Jan 2024 02:49:26 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [q4EZ1df+xMjiXnNRRQEQ0qzbJPIMLc0iiNyei524HTDI4XAnoUHhTiKGH4HmnRlN] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|GV2PR08MB9374:EE_ x-ms-office365-filtering-correlation-id: 07f81358-23b2-4477-1861-08dc0b3d6f5d x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DDGRXZaxgj2YYtaDFaGBcqjQUwLe7ichDswcifl0FKmNQu2mYgE2W3AufjL1kwWH6rqVQwG/x53NS27mj0yv7MWmaBZhy5+UmpbXkldhGx2W3VQWJSio6CDFVHkSgGMQbRvBaSdJ+VGj1f4Sv7ZXyF+0u/iLMDIZ30vwJ4nzllCXwyE/hkpT0mhZfwQwoPKQfNFFNpt6iu3xo2xIZBnFChHkKK0W/8U0DHE7DEcVtgCSN/jw/R0x9iVpaqaKlHROkHAnMClrkU0gAduuHl6+2sHLYPqDSEbAb+u1cDZAr83W/lxU+mikkQTa00dLlY1phNTOJPbBPqXbLs3ZahjT2EKbRn1ARFhzc6fs+ivJvTHqgfXD59BOLZWLsNWFna20zXk5Ob4j0g5kSW95Si90z5Cu6tMDMoYFHG4Er4sDawFV552UPjJ9AvsYfC4Da0sITeV5AOGT0DgKkw6UcBX0c725z4dpQW/N0j5pDjEaJ9gi+rElaPfWc3kvX31/97bOx6H/nbV/6TaRActc/I4KawLOEjhTOtrko7Kr4AoGM6J3/xNFmnyZSDfwmjky5Cjk x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?X5WDMRxb5AlLZ2sSBDRrPFQBFd1B?= =?utf-8?q?g9R/PvmC4BnigrfGTuwpnYx0ut4khqLbvOsjP0EvGNVi0u5XOFgRmufPpAvL4+Zx1?= =?utf-8?q?5CpZKNoxw1a/gp3LzzKaR4fq6CdiYhLphrxdwvaJLckQ/e//8LOTqGHHdbKStl4HG?= =?utf-8?q?4F9m7q+9RLNMy0nc7b9ZDcbUFkBy2JzAWdYKh2mwjfBLTPqH/NoIyhi13GwIeNCkM?= =?utf-8?q?XnCP4r7CQ7rqJ4ZVmT7pw+PtcUdYKoGGrJ3H7TET5xI9e7Qg8ZGAKn0UEujeS6k6T?= =?utf-8?q?Ib5b60xGlWjxNwrEnUfJYnzxZmKTBrHusonihrhZcNBssq29cu7MWrNNNOYJgrSyq?= =?utf-8?q?bk1AciX2Orx9DbrGBTwUmKzPLi8h662tY5yGO2lO7idVKoMruuEgWDg3MNZ2Saw2P?= =?utf-8?q?c2V+nEwuOfVKe90TGy+dUNl3jgZ7QLbC7uxeTHTdebcsL1Rq1wNq3gZ/TxgRjVD/V?= =?utf-8?q?1j/IJdOCy3Ltim4F5y4vpGP/X6YQ5XT2K/K/i+tm5nBRx1Cud6NIVyj2fNd17FA6d?= =?utf-8?q?MN2RA7kXi8zafH8mrkWxH4Ha20stfyuga+EmZ1+uTUcC6pfSsdSXe1Prv5z8fDxHR?= =?utf-8?q?m8oIOgkKpGhGXSkEGU1nBcK+Na5uJjIL/EQWKou4gfV0YdAF0YGF+KOR/2juFeFuq?= =?utf-8?q?jzOQFVTqKUPlLe111UZBxtavcr9h6QBAZ9JITUi7nkhmrJWJ4wB1EFH1U+kQlqfw9?= =?utf-8?q?7SfRmIobJfet5EOgVEGcqnjqFNm48SzaPetYC+V9fGHWUAKtxjvdZEa05mruS8UAw?= =?utf-8?q?GD+cIAb2V3HUbEjML8GQOrtb5TQ/rMNnteJYOuYlzvXZQvBOvhw4r1pCmI+Dnh2We?= =?utf-8?q?mogrZ+V2mrB/yXCjhsH14YPiZr/7w88BAg352wTKCKW1J3I0kNV8wp/x/OoJkuhqT?= =?utf-8?q?abtwKWZZ9CJsIAYMOojFlXAasxHhTEXRxBZDMwWaQWA++AsEGz8e7RyeLn0utL2rI?= =?utf-8?q?Erefqmae8H2w6HccqVF/jzz718rrJV9PQg052zBeR4IUa4zrHyGch0O0tE80uAy8H?= =?utf-8?q?plsCS2O48zyLGrVenipxTudrWRK+p3lH0mNYOi7zJ2fQeSETdG+krRR8mNxkWiDLe?= =?utf-8?q?i/CJlEFvdjaVDeGsV4AIETmgGvWu00wZpR/6blJmO0QL1HU3crXay8i3IYt0uz7MY?= =?utf-8?q?ip4+JltwkCSpkdTyto65ht38NWDYZzjWun5FVNbHrYI9RYc0Klg8sbOEz0L511DPn?= =?utf-8?q?pwNbVZ8txzUCdh++gfBlace0o2vzLAyPjAcXSvQ=3D=3D?= Content-ID: <76F3F1B30005E048AAEB70CD27E3D9F6@sct-15-20-4755-11-msonline-outlook-37dd7.templateTenant> MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-83b42.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: 07f81358-23b2-4477-1861-08dc0b3d6f5d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2024 02:49:26.8611 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB9374 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3TZHS9CRiGaG 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 Signed-off-by: aybe > --- libavcodec/mdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.41.0.windows.1 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);