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); From patchwork Tue Jan 2 02:52:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aybe aybe X-Patchwork-Id: 45452 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6485872pzh; Mon, 1 Jan 2024 18:52:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOv+qqN7imfMt7apvILSGPMqHRUkVqBiYkUscGKLFwZ6A1AS5fLPcWHjoCCxWybXXbdXjp X-Received: by 2002:a50:ba8e:0:b0:554:4c4b:3bea with SMTP id x14-20020a50ba8e000000b005544c4b3beamr5977024ede.15.1704163942941; Mon, 01 Jan 2024 18:52:22 -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 z44-20020a509e2f000000b0055343d3be78si10749721ede.239.2024.01.01.18.52.22; Mon, 01 Jan 2024 18:52:22 -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=VWhgt8E6; 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 0BC1068C8C4; Tue, 2 Jan 2024 04:52:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2044.outbound.protection.outlook.com [40.92.89.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ACC468C8C4 for ; Tue, 2 Jan 2024 04:52:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekOkY228ZL5TFkbzWwDnTs1LAOYDyNWHTy1l6ULr7xcW3NWr22RM1qscYdNYKaVw/fQjj0nZaaAc6mjSufXXOhki0ZrbwMhLfH6T82/EkLENTQd6ff844X9L8wWZpmTXa255XhiFcvDf7qHDVj4HjV61ueKUQBr9grp0sYFqb/Nx8tcm7YbCWczrRRQXzh8fM9NTVELzA+Xj8nmglUrq3p7PWjUI2kB0T5Dknp0EwAotSgxRG1t50JogR5xJCbjWnrRt/tH/BAkMnrsG8esh/a1Tqjs5SArhd1FIuj14ntk9X098/dYizOF86RAz/2MxXYCeLfo3wR4U8OyA8M2fMg== 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=kUQDHOYaygj4wnWslp+kgSLWwu4pmw1o00swUkGfFfc=; b=apsSJY8uPuxDpL27eeEm0d48t01wXiedF4bFv4odzT59qiSaFDKj89Wr7aD+kB8Rv5+nZhdLZCjFfQV//PWzqsyjo2ks66Yj7NBv3lNh6PP4XUlRdDItAm5qUko0cPhJIiheNAHUM7h6j/6LrQcRdlSfoT/NwgGleFet+cOXdYbsmIrm6tFVvaYtP4hViCSrnc422t3o3lGFozLzvUGELhSfesFuSQKQOlOzwagWE8qoCv2vL+cXBCPqlDWW9kh4Day8f8vzoAKqZHqmkvq/bAyZVjhXwxKyc8jkeHCDxiMWal//P4+C4kdUXMCbwEgH4POL98WcrEW5W/a3rr2GDQ== 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=kUQDHOYaygj4wnWslp+kgSLWwu4pmw1o00swUkGfFfc=; b=VWhgt8E6B8craMOtiTWUsaFw2WRHm/Q4dYNRq9HIBAogim//frjB1uqVLRUzm5+6aIp34wkE8dcd1hPG1h4/WtGn7t8ZTLeDeRNN9KpdqG+fX/dTF7OuxDZ4+FwqI0OqXEC/wkr6BEpRp/Uy4UkwiN6PVJPP+2iKZTNWQ5AIRxrDFuQ9VILJfX/z0NgH+A++W7kG68nRwZEH2cgd8V/0A2HaSBErJo7jEL4ATB84Jw8cl60uPQnJF5dKFARGwm4pY0whbNc0uVjgLr/FKomhy0JSgi+bQWTDKJRr+v0ndTC05oOmQsN+U4JoyxqiYuF4Yawa/dtw20wKGJceDTp8yA== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by PAWPR08MB8886.eurprd08.prod.outlook.com (2603:10a6:102:33a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Tue, 2 Jan 2024 02:52:11 +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:52:11 +0000 From: aybe aybe To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 2/4] avformat/psxstr: fix demuxing I/O error at EOF Thread-Index: AQHaPSavhDa/TqmGVEeOzyUZ/pwY+A== Date: Tue, 2 Jan 2024 02:52:11 +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: [MVM/2CD4wcSzfhb3VCZKpGdy2Vle0dHB6mo6fMExIacjE9wDnJkxDy+/9Th5JROu] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|PAWPR08MB8886:EE_ x-ms-office365-filtering-correlation-id: 9bd364dd-cdf7-4e7c-c0a1-08dc0b3dd193 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oTxuHTD07r7YmxsiLQ99WlP2wYC/hdB1HLoO4wgFipOpcUtPUf9pMMe6uoB6YT0PRh3KRiUrzdgRaK5DnBMuL1GYaKJjPsHeewKcyr1WMtAfojsy3HM3geIv7BZvuEVd4vHVx86oiraLjv1zTM5E2w+lJ6JxKuvc/P95O5KZt4Rie2G5FRI3v3JNH1PWQe0phdpLHiBzb5rh3p6e9nIf3GfNUg9jouhImnhdWXE/YCVqCp5XHJUMQEp9wbrDv31kByCTb8YfU0YJq5Ppgb3iuB0crf1vx/W+utIUAD5tIsDLHGy0ICzxNtRWvHgzK/nm4wO50qdz6EVNfIX7zEXIp123RCyxf4hD3X8VM+ps6I/MrKgGpc3Qyhct1mEpVDIXbvjn8qFotmRWaUpux/1aLgVozgNoWiOYicHG9sdxICyOKRUO2+vClmZPH9uXA3SfQLs31N4gkKIZx+UwP334C8BqiyG5enMnc6DsIrHt8+Mho14V7dHi5y/bsSpJKHJOcePRoG1695+y3ZR155oPtSI7yPLw33uPBQ+YtvRWO42l2M0p3UaEWIFQ3gA2iQyn x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?vib8fkRRYNxb2wzVmJDV/Nv/x3K+?= =?utf-8?q?AJb5HH6Q/C0/ZTNV8puXe921DqE9qUsbbpqV1xbgJSjliYtNFtavZLF1gXOUNWlyl?= =?utf-8?q?RAZG78BOwfHDoLd7ed/GxqrK15CDd0WCFFI5b+oaH38Ngutr5Yr/T+BDblbQ4zU0s?= =?utf-8?q?BCUQv0vHhQPfE0lk6/ap6E2hP43DSU3W90y374tk8TPbcSTs+KAHrFfY72w19cQE7?= =?utf-8?q?/UduvkKX93qoCllsp+sqQNMnQo31k2Ea+zsdC7NcPoCdw7f4IWdLPIwT1YfZ6qsI0?= =?utf-8?q?edhRb2SL0lX4tLH+78WjD6qZzjVmFEcg7ktN/SYuAvAh3lXMsTA7RX3UTDTbwer53?= =?utf-8?q?XYdAf1svc/Js5GjayPhqTMSp9x8KeAbXgPPvctGcsJGa681KaDbVtEZviLY9lrZJo?= =?utf-8?q?rOpN/hCq/NUCFDEwMbYXLU1VWfqJPN3ewqWa4Lglz6FHyZkWU2Jd+qw0iQhxAP57N?= =?utf-8?q?rww1y8aiM1JRFVdS9slPQcYYarBuV0BDNP/uBCRDJBmS/l2q466en9u+s9Brr6fN0?= =?utf-8?q?yFAvlTFxlaOM5YuhE2BmaUOpe4OSe9cPs6RKjCpgJMKkzrVr7MT8EsI0Es9qGjw4+?= =?utf-8?q?Wktrr0F6++i2uaM3M/pUn1QM4vLgywDAr6lHYm/WwFqgNoXMLy68bbYJqdqx6ygdN?= =?utf-8?q?t77selCDCqMDjKHjQ00IX3+bjCnQl/scVndcnkfrWJoNO6M3NYptjRyEv/hmLigJO?= =?utf-8?q?E70uEY8vNCmN1X6nholbK29+o+JA7qWAqqrY08RJoq/+AxOH7qAqOdC02Rx+gR3r9?= =?utf-8?q?4+kcHHNtlH/aKeoLcRqpYZ+TV0HKGOQSceVh0mxky1hgJVj/qMQsGivtlw/bIHaJF?= =?utf-8?q?KhgHcBi5mwwWQo5Eb/48Zg4chRQaaUWlD6gHZhKjnzIT+O45zwGNY6rKJzEM5Loqp?= =?utf-8?q?9V1G3cgFYYFEe33vhQUjyrl9uUakAIkSX95JOQBIrDI2p9ZAclJEFb6TBxzUJp8Ui?= =?utf-8?q?chD/EJoA+cpGr2mDIutdrvTFz+xobhPrNaBO1o4ok/xBHCePz2ZNNaD3ZnzeBUXTp?= =?utf-8?q?wIpS5YhN5/bgKEoMtdKz3Xaon9j3Kr+B1a3HDCHhyANOKzPoZ9g7HTqr1RZueieEC?= =?utf-8?q?Lp+4GJ1QlbHbcxHhRTAO13LVixiJ/jfNqXb7l72KoaDk1BSdrXSpNww9aOuhsEdJZ?= =?utf-8?q?PMKFuQRrTD0jz1+MT3pk/WDVx/98Qvhd9AO3t4GppW+8ESkaWof+6Y+YePk4KtwUf?= =?utf-8?q?zCTafViQZ0fSnEyyb1I0y1coEg4oRiI/jrGiSYA=3D=3D?= Content-ID: 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: 9bd364dd-cdf7-4e7c-c0a1-08dc0b3dd193 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2024 02:52:11.6271 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB8886 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/psxstr: fix demuxing I/O error at EOF 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: 0m07MK8r7LNf This second patch fixes the following error at the end of a .STR stream conversion: [in#0/psxstr @ 0000000000681e80] Error during demuxing: I/O error It's been a bit of trial and error as I've never used ffmpeg, but returning AVERROR_EOF appears to be the way to go (doesn't complain anymore). Signed-off-by: aybe --- libavformat/psxstr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.41.0.windows.1 diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index bb56b05688..72d14b9792 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -165,8 +165,12 @@ static int str_read_packet(AVFormatContext *s, AVStream *st; while (1) { + int read = avio_read(pb, sector, RAW_CD_SECTOR_SIZE); - if (avio_read(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE) + if (read == AVERROR_EOF) + return AVERROR_EOF; + + if (read != RAW_CD_SECTOR_SIZE) return AVERROR(EIO); channel = sector[0x11]; From patchwork Tue Jan 2 02:57:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aybe aybe X-Patchwork-Id: 45453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6487041pzh; Mon, 1 Jan 2024 18:57:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8g+DrKq1UPOEsPOs4bJeYRxGNFnbAiPuKv8C3p1c6lsCrZAFAr03HsDXC+ZDAwfPeI/0v X-Received: by 2002:a05:6512:401e:b0:50e:7f62:b141 with SMTP id br30-20020a056512401e00b0050e7f62b141mr9549157lfb.1.1704164249649; Mon, 01 Jan 2024 18:57:29 -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 wj14-20020a170907050e00b00a26a5f8cd6asi9302626ejb.145.2024.01.01.18.57.29; Mon, 01 Jan 2024 18:57:29 -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=MqALJ2Xn; 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 7710C68CB55; Tue, 2 Jan 2024 04:57:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2082.outbound.protection.outlook.com [40.92.66.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7348668AC2F for ; Tue, 2 Jan 2024 04:57:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GWcJtFDWvWqhLyOMzkHgmcoIwjsPvTZR4aghDK+wGInq3mbeRFoKUlnF2Y/c/tqX+12ws1EAChFvI/6uw10mTe6m7HaQO2NZVe1nnwFIQl2icKe4b6UQqU0AEnxhNTuQb9qmckjj+ShM1m7E8gfQhAIl3uSC22NgDOZ+wwql76KSqHNV8AvvhUnwt4Wns112/pN4KPvpjaBwh0VH2upzuIJFmi0AaSfL/a8zpETsRV2q9wF+HDkd5tKZaqho8qBA/DRu/rJ5OQN8QroAbZYt05FkubO5ZUPTuA+6BhzBS3sAyHUgnRUBxRouDJi3NOZDdtI2jEESrXDFGaGGJxXFjw== 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=BPLtKsuA7pQG1WU+1dTf+Z4PAnQNCMNy1TI+rU8Djsk=; b=RZGCTaHfUgb02oE0pfDm/Q2lI2iaqL5Vc4OFKdvGZl20JGTT80NsAoKLI5wOp9KqefnuDBd+MVIoqD4q8fYy+Bb3XqceHSdHJkPfVy/zTorEq+PVyC6Mbz1SpNuewxacxp5ayhjpNN5LDjibk3Lfihho+r/OGbQQzqlQCtPtuj+mV2imUozc7KgTs37umjG8RvbyuhN4Ngot1ZemX564cj8tEzgS0o6n5n8919e6W6NorlWMTWhChqhyeh2+gjWFjEBGVJm0uJmRP+zAA82Kbcy5hlTNa6MDQeQm/ep0Dn9Z6UaIGYRmAQOACGVosgYrcuXkmAlprBGzpYRL+NDP4Q== 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=BPLtKsuA7pQG1WU+1dTf+Z4PAnQNCMNy1TI+rU8Djsk=; b=MqALJ2XnD+x3WHKlr36HZCgEAc4ni0YJ2dSoL8/59puR7Ad5pSqleGTstKftb4949UJ62T+cbIjVLmPFKY226VrAacosehrEdZl/s0rnmRLs62p33CQQqAqgQhAIEXOFA/L9pJYu853VzWtED8yq2oxyuyyxWLOkHEP11L3xF5AjDjISggwbHbB2p9ac/cn7jUMipE113/FDlJRs5T2KIHwXsHq1+plydT9KsNI6uyiy1fn5ofudrqda5XjWlpiV0QkfhKRyyIFuAs2kap/AGcUocpJ3iHe5A9Nr/0+q23LS1+JMi17z11Ylp/r+o5SwS7fyGGInYpYVtbeV1Z2s7g== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by PAWPR08MB8886.eurprd08.prod.outlook.com (2603:10a6:102:33a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Tue, 2 Jan 2024 02:57:18 +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:57:18 +0000 From: aybe aybe To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 3/4] avformat/psxstr: fix unknown sector type 00/80 Thread-Index: AQHaPSdmnh62sIVtc0eZseccYBpweQ== Date: Tue, 2 Jan 2024 02:57:18 +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: [EIBWg0rA1xtJa2/WWRhU0cikmOx/cb0aNu9XlOjxZz2habSgATaGNfsj9A2sBJU+] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|PAWPR08MB8886:EE_ x-ms-office365-filtering-correlation-id: 73c9626d-b392-4e9d-fed6-08dc0b3e888d x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: j4Vgym75vrBNTKZgsJlIRn/aKHiEhsDa1bkipMBzClINGDj1dKJkBP1z4z1dxkPL+661qAOqvsZbPfC1mh7Cn4q9qb3DJv9ZEZGIdA4PlQTiovrXs3V72RoI+CnXf9ylhyiKrwkG783JOWODbTb5aDeCfwTVnHrjfWztaTr1apWKcweXtGWTkJIe20RzuSzMoDv8MTiuAT3xPMPsS0A/55zmEXQToSga7cSuwC8jmB2FvVebQxT2XqcB24AhCkH+GiRIkOicaeCOXbMd7h7f486n321dMH+J31yHfQ1HoaaKaGdyt7S2/JsY/8+MzM7BoVdMC6xiigr0Q2F7vagPQZQ1VHXcUx0S7sLpua+nHLT1nNSqBkNN3WbZNySdP8Gbx6Pnkn9k7MdmhD3X3TAJOfI+DOlgUWepOghUsrYgnScc+eQGBLEjA207SoYaHo2uPzO7ELrsY4FQAqn7Ac+hsD7Qx/KNawiUJny6p8aalXPlAzTslGpEM8nX44zE7S65sAtjaT4my+vBuAAAfte+l/t3lOy2LyrYtnk6J41K2EGOIxGbVFvLbPh6og4PghvP x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Lw3jaxYIr2CID3X0M116NpXVeGpO?= =?utf-8?q?P4DYEA3+1CKdaR7Faq6B331kcJV1OmITFB3pbjI9HZbj7FjbUsTnvg8+qdByItdel?= =?utf-8?q?wrGXz4OkO/J6oTFCxb8OjuNmjvTGV/VI9CSs7XSor9nN2oItSRMjlx9r60UML7Xpr?= =?utf-8?q?mZAUz9x78Gm8YOmMlHN1/X42p+SWy8/N0BJD+sG4Cu1tSU7igjxBECF62KS1s3HOA?= =?utf-8?q?h1aCPx+sET2GV0ojaX1IfO4pvx6LaH1LVY6L29P0J+5lbSVPB2VS7HbfxWODDhNo1?= =?utf-8?q?wt+XRaucxfiv4kzfp0U3l7w8X5t9fE0j/RpET77uR9EBjKwHIqmzTtAbWYoXFT68k?= =?utf-8?q?d8Akeg6vgFbcVsqb01Phy1IrNEY+jqPb8/S+CN0BH9qOvqEah633xf3wBpDYqhXBt?= =?utf-8?q?VT300gxilMeSNE895MuKeM9G2rS+NMbES++T4HB1pmLJOAE7FuPljWxI2ypVn9+Fl?= =?utf-8?q?G2wrGXbvh1/FgduRneGW4IJjIYMtAS5KjZNYwZu9l6g9gPFpdeAnTnHX+QXkhrmVP?= =?utf-8?q?MpW/tkq50BXgz9K+nn7HLiH9cdDweY6SjUBPd3CKOxsC9ZA11kgu28p++yEajVod+?= =?utf-8?q?7/9Z2mnojGgrIiyvS/RFDerXAF2MHqQPURPv793uUf9a9YV4mmAvtio5dRJME26W9?= =?utf-8?q?AfSBshGpfQYEAXnKwF4HRA++r2Qsh4iW+5Q2lDJi1MkNloYmHQeMGjE0s7N2ewqLj?= =?utf-8?q?rIrZe/s1uCPkOFdIpYT5dzbZEQtG+Vy6M16VTMVqOVgAmjkia6sv3eqSHiqfi8zOg?= =?utf-8?q?qA9WncKZQF42N+wDcI96ZQrrNshAcUjAoxApjQqZTWji15kmJ7en9x83RGvGF2n8z?= =?utf-8?q?btUgDhOqRR6EH3PjmtTYrM7ogb4dYRrO3dpeFofx/RkcFLBAISJvZhzbx/ZfUYq3S?= =?utf-8?q?nDcLtz9N8vIFqOD/B/vL5ZZSHozIHQg5GOnkzPVvlrZLL5kalE48xUVBKEv1curw1?= =?utf-8?q?OdBpMXcrDTnqxY3SClLgrdGkII9WOZ8chBcJdidLNrcMJL2StY7sIYGFKiTPTJOiU?= =?utf-8?q?1L7BIEerRJVzac5BQSHGLGbrembpEutVkKfU3fxsccIcYfT67GzwNY4zrNn046krT?= =?utf-8?q?ArLVHz+VxUMPs39vWcB+OpL6BcfMIT7ITAnl1TpCOdcACZ+FXli0IHui1p7m3uqLz?= =?utf-8?q?P/0Lh5ds+Yc5g3Vyk+GDm2ZxLVd/oOEySe1i1khw9Rnf3uMbRVfejP2oYh7f8eXHv?= =?utf-8?q?tUE0K1g6ykXSJ1FhpAx/4DpWlVB5q4NCspwEGPA=3D=3D?= Content-ID: <8AABA9AF93A8C24B91CD0D36C0564307@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: 73c9626d-b392-4e9d-fed6-08dc0b3e888d X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2024 02:57:18.6243 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB8886 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/psxstr: fix unknown sector type 00/80 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: RCA5qwAd98UY This third patch fixes warnings that are false positives (still on STRv1). That's because these sectors are simply empty ones as can be read in "System Description CD-ROM XA, May 1991, 4.3.2.3". Haven't attempted significant refactoring as it just works, left a comment instead about the situation. The result is that there are no more false warnings when converting. Signed-off-by: aybe --- libavformat/psxstr.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.41.0.windows.1 diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 72d14b9792..306a690f52 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -48,6 +48,7 @@ #define CDXA_TYPE_DATA 0x08 #define CDXA_TYPE_AUDIO 0x04 #define CDXA_TYPE_VIDEO 0x02 +#define CDXA_TYPE_EMPTY 0x00 #define STR_MAGIC (0x80010160) @@ -274,6 +275,12 @@ static int str_read_packet(AVFormatContext *s, str->channels[channel].audio_stream_index; pkt->duration = 1; return 0; + case CDXA_TYPE_EMPTY: /* CD-ROM XA, May 1991, 4.3.2.3 */ + { + /* NOTE this also catches 0x80 (EOF bit) because of CDXA_TYPE_MASK */ + /* TODO consider refactoring so as to explicitly handle each case? */ + break; + } default: av_log(s, AV_LOG_WARNING, "Unknown sector type %02X\n", sector[0x12]); /* drop the sector and move on */