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 D001248AE3 for ; Tue, 2 Jan 2024 02:57:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F59B68CB3A; Tue, 2 Jan 2024 04:57:26 +0200 (EET) 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?B?THczamF4WUlyMkNJRDNYME0xMTZOcFhWZUdwT1A0RFlFQTMrMUNLZGFSN0Zh?= =?utf-8?B?cTZCMzMxa2NKVjFPbUlURkIzcGJqSTlIWmJqN0ZqYlVzVG52ZzgrcWRCeUl0?= =?utf-8?B?ZGVsd3JHWHo0T2tPL0o2b1RGQ3hiOE9qdU5tanZUR1YvVkk5Q1NzN1hTb3I5?= =?utf-8?B?bk4yb0l0U1JNamx4OXI2MFVNTDdYcHJtWkFVejl4NzhHbThZT21NbEhOMS9Y?= =?utf-8?B?NDJwK1NXeTgvTjBCSkQrc0c0Q3UxdFNVN2lnanhCRUNGNjJLUzFzM0hPQWgx?= =?utf-8?B?YUNQeCtzRVQyR1Ywb2phWDFJZk80cHZ4NkxhSDFMVlk2TDI5UDBKKzVsYlNW?= =?utf-8?B?UEIyVlM3SGJmeFdPRERoTm8xd3QrWFJhdWN4Zml2NGt6ZnAwVTNsN3c4WDV0?= =?utf-8?B?OWZFMGovUnBFVDc3dVI5RUJqS3dISXFtelR0QWJXWW9YRlQ2OGtkOEFrZWc2?= =?utf-8?B?dmdGYmNWc3FiMDFQaHkxSXJORVkranFQYjgvUytDTjBCSDlxT3ZxRWFoNjMz?= =?utf-8?B?eGYzd0JwRFlxaFhCdFZUMzAwZ3hpbE1lU05FODk1TXVLZU05RzJyUytOTWJF?= =?utf-8?B?UysrVDRIQjFwbUxKT0FFN0Z1UGxqV3hJMnlwVm45K0ZsRzJ3ckdYYnZoMS9G?= =?utf-8?B?Z2R1Um5lR1c0SUpqSVlNdEFTNUtqWk5Zd1p1OWw2ZzlnUEZwZGVBblRuSFgr?= =?utf-8?B?UVhraHJtVlBNcFcvdGtxNTBCWGd6OUsrbm43SExpSDljZER3ZVk2U2pVQlBk?= =?utf-8?B?M0NLT3hzQzlaQTExa2d1MjhwKyt5RWFqVm9kKzcvOVoybW5vakdncklpeXZT?= =?utf-8?B?L1JGRGVyWEFGMk1IcVFQVVJQdjc5M3VVZjlhOVlWNG1tQXZ0aW81ZFJKTUUy?= =?utf-8?B?Nlc5QWZTQnNoR3BmUVlFQVhuS3dGNEhSQSsrcjJRc2g0aVcrNVEybERKaTFN?= =?utf-8?B?a05sb1ltSFFlTUdqRTBzN04yZXdxTGpySXJaZS9zMXVDUGtPRmRJcFlUNWR6?= =?utf-8?B?YlpFUXRHK1Z5Nk0xNlZUTVZxT1ZnQW1qa2lhNnN2M2VxU0hpcWZpOHpPZ3FB?= =?utf-8?B?OVduY0taUUY0Mk4rd0RjSTk2WlFyck5zaEFjVWpBb3hBcGpRcVpUV2ppMTVr?= =?utf-8?B?bUo3ZW45eDgzUkd2R0Yybjh6YnRVZ0RoT3FSUjZFSDNQam10VFlyTTdvZ2I0?= =?utf-8?B?ZFlSck8zZHBlRm9meC9Sa2NGTEJBSVNKdlpoemJ4L1pmVVlxM1NuRGNMdHo5?= =?utf-8?B?Tjh2SUZxT0QvQi92TDVaWlNIb3pJSFFnNUdPbmt6UFZ2bHJaTEw1a2FsRTQ4?= =?utf-8?B?eFVWQktFdjFjdXJ3MU9kQnBNWGNyRFRucXhZM1NDbExncmRHa0lJOVdPWjhj?= =?utf-8?B?aEJjSmRpZExOcmNNSkwyU3RZN3NJWUdGS2lUUFRKT2lVMUw3QklFZXJSSlZ6?= =?utf-8?B?YWM1QlFTSEdMR2JyZW1icEV1dFZrS2ZVM2Z4c2NjSWNZZlQ2N0d6d05ZNHpy?= =?utf-8?B?Tm4wNDZrclRBckxWSHorVnhVTVBzMzl2V2NCK09wTDZCY2ZNSVQ3SVRBbmwx?= =?utf-8?B?VHBDT2RjQUNaK0ZYbGkwSUh1aTFwN20zdXFMelAvMExoNWRzK1ljNWczVnlr?= =?utf-8?B?K0dEbTJaeExWZC9vT0V5U2UxaTFraHc5Um5mM3VNYlJWZmVqUDJvWWg3Zjhl?= =?utf-8?B?WEh2dFVFMEsxZzZ5a1hTSjFGaHBBeC80RHBXbFZCNXE0TkNzcHdFR1BBPT0=?= 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 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: 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(+) 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 */ -- 2.41.0.windows.1 _______________________________________________ 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".