From patchwork Tue Jan 2 03:14:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aybe aybe X-Patchwork-Id: 45454 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp6491816pzh; Mon, 1 Jan 2024 19:14:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IHdunx9fQmyOiMiFDGRUrW5ufK6WmTjWFtBR5HJyrOmGtm9EXb+c7GPn0UhwUqfwwv7jKLX X-Received: by 2002:a50:c01e:0:b0:554:b045:c204 with SMTP id r30-20020a50c01e000000b00554b045c204mr7975677edb.79.1704165272967; Mon, 01 Jan 2024 19:14:32 -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 dm24-20020a05640222d800b0055699de6406si151344edb.126.2024.01.01.19.14.32; Mon, 01 Jan 2024 19:14:32 -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=dubg9LW6; 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 0F5B468CB8E; Tue, 2 Jan 2024 05:14:29 +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-ve1eur01olkn2100.outbound.protection.outlook.com [40.92.66.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E97AB68C41E for ; Tue, 2 Jan 2024 05:14:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ix8CYPX8C5I62E7ho/NHSt6EvkQZ1t4tt46ntinMefInSeOzOFXJZYao0rR2pCSYlsCcBSWi+yKBPUwpUTk62hwnVjzq3bWBnTdtRCgy4FLXBMDxKv02I2C6Y+bCFn3TifJmfoK+3tAlKW2+ZgkRVvXZp9ch3B6yOTVX37IWda3CNkSiOy72xR1sOrnTMLMtOevguuRP0l8KVk9JJeOV9gJGCFOzPE/TOB1vpgSIOTJwkakGryXqWRY0F+LEYE6IuMBlzwVOaRkWvs0k9c4NptjhE5R0wKiFrixgj6BftNEca10ZoLw/XlGaJaXNft9eDrA7OtexhI803d5oN+dyug== 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=asNN99yOBlIkZtleB0gWcDLrzUiP78nzow5ni8TuDTA=; b=oCgPhvGsWSRFkIuRzAjsAWSbRAbA68CNROf3mamUkBTKgeZtn/lfSsLoFTP+9DtYp+AFZzX9VFZB+NHeMc0Bj6i3AoBqELzIIPEh67I9yQnMjlqiR+e3cZvkCSfraSRtnYgweE3yILG1z0+RhhAuRlI651o0OokYElk0xFcm+w9BvCa52Qxvq0VImmWMy3zjJilByVx3IpsgOyPcdwNCd8JKs1OihTLRI6yD51OOeECwu+NNg1nbXKYcaD38FuVN84WdtVXKzJT8OwiUNCssmIpBeclrvE65A8Zg5nCwB4F7ypun55KvPrC0DoOlCfgWHWouSBdZjYr8yRTcF34ewg== 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=asNN99yOBlIkZtleB0gWcDLrzUiP78nzow5ni8TuDTA=; b=dubg9LW6ve/2f9eS8QIJXQy+woDNHUJgk/of7GlCtPFU45cC5jD2oxX8YRz26D65fUuvwMIkhWMU/CadsoWeZWJxtSEHnuip35Xdvk4wCoUkY7VNaPyKq4iCFOhIZG3zsD7ZuAx2S/Mu1GS+hsJK3jU8VaMxrUa5Fs1Bop28h0dfZ7ooPm2TIfxDOVbF58zZXKOc7NanezQy/62ZoHVIDP9PBPAZIKTgG+fzloRTV6IqH6RRSfUslDbjXSqlf8WOBT9MGpC7a/shUoigYvIQ7EngRXaF7+1g7IiAtqfJhfBYC+NX8R7GQl7pkqUWJHW30Em/xBiAGdWdLe/uCKX0Pg== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by PAXPR08MB6717.eurprd08.prod.outlook.com (2603:10a6:102:131::15) 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 03:14:20 +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 03:14:19 +0000 From: aybe aybe To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 4/4] avformat/psxstr: basic FPS detection instead of fixed value Thread-Index: AQHaPSnGZtTdwMTaEkSLcSFow4T3nA== Date: Tue, 2 Jan 2024 03:14:19 +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: [egzH+KymuhhdSkh2Lp2BdW3L2VBAONVpvW/WZWDscmcEE3xDsBYf9cq1iHMJkQaS] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|PAXPR08MB6717:EE_ x-ms-office365-filtering-correlation-id: e5b6ef20-7217-4bd2-f587-08dc0b40e93c x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xh1q/tWPxeEtkfZyNBuoau7Vd4m0mxn34VyGfmbcjahWoiZvF3X7Q1VoDf+pK/tjoMwam2zj9xmhdYK9dtRu7lNjuIvedwvZkRMEDaHzeI/gxj/7GvycaNhUv4zD951sdnTuA2aCL8CksX/MHOYvGEFZoBpjUUoyagRAsgNbR3mpVO30u7fAEKZcoKKLxbSqfMe+mt9SBDmUxNqLDvksvudA+dbC+AggKWnAw4hYOYOwCw107YUsEbvmUGdhmOHYvcBdQLZJIKPRp1QRcL/UCLcr2oIT9sVOa2A8kF9aslalTKAviKz881P6qo18T/gOAbZRKQ8yJ9xWzus4k5JRF7iv9/jSMTNT48xK27Lo4arIAgyHZ736ZGM6ey4C2yLJGmPf515BiXWnRsRcmEmAWWXdj0vWq7qgFM5R86FcSED4y63/UK1XoUbQ86p6VMJkP0YsVW0kGSrgQ3X5mO+ZNAyt/qM3JMbvk1htcxofRGUocyOVug1pKQgneTaaJZXzDFp7NFZ22CM8rvbiBdoXSEsgUNk2HXuUgkSWTnYZYFf9gzGSSm4WQOemqgodCr701o3dQKvqy0oz0wVfqAWplotD6HHIKKqUG3Fttn9vhTQ= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?tkHWhBpN/DPrq29Babi1MA97R7S3?= =?utf-8?q?poTsLbA9/40YLa79KqGh2rPRdSMr6DDRTbg79t2y5U1SPRyVT3GxzigMWD4y5sFAu?= =?utf-8?q?ZuEHO0FUmrDiVs3eJQK+ZZcjYJPIdo1knCyEpOjcvkBEvOykY3VfGspKaYKuemQs8?= =?utf-8?q?NTYk6VEWW0mmAQZNwlZDSEAn/Ud/7UPFUosJ/ZEwuKjQkHWHtBbWlWJDqIeY9BCO8?= =?utf-8?q?B0dFybDfn1Bh56d3oj0QBCu8vIWgPnGU/zU7Xc9U54s/wWS+YFV7HFa+LU5kSAkg0?= =?utf-8?q?ChZVWn5nCFsQPIvVgZhk5ncf8/IEUpDwYHRQinP9o7Q6m1yRZsMWf1Q8UVaPneuJt?= =?utf-8?q?z0TScqG92rSVLUGOaxGfUateOjqfnQqtiBvwFihF4kywqzu9aLQF+Ws3obmFRnf/l?= =?utf-8?q?nDgztSGmCELrGUdnvKgqTdn9w22cRN7QOdGx8otpjw8TNEdZnU+1sEeADhv1LX6sf?= =?utf-8?q?LxQHy4w4wuf75ZvWc7qvoapEWWYKyAp66Lpb4u3IGH/w754IjEFN3xGnhTJoqq0bX?= =?utf-8?q?IjmVWim7V+mvQ3NLu1jtdhEJOg7VYT8JBMhbXvvEookms5fF6cr2yATJS2exoSwiL?= =?utf-8?q?BZweQEjnIan+FQEjiXUyrCATXuxWW92353S8zUoTZMDQK/UxP7GWRY+q++/YIdzw9?= =?utf-8?q?nFecjFliPTdwtPXJG7Nk+K/+p6IIW+eG7UdM3GHKpd60qwMZJnJL8kSuB2GWt0Sgm?= =?utf-8?q?AfO437TyJ/a6giCemyPxbvxLjq88rNVNNXoV//kk8fXUPfCVLESwT5pQfg7iTJ98J?= =?utf-8?q?NY9hvUi1UOpf0+CjRtSVrsNcULWafbsHvsLEhc8RmZI8rOG+wiGqmiNtJ8sMy3e8f?= =?utf-8?q?TSJ6kZEmQSbru8WuIQ8qcMr/IeciaEv0JoSGmcQgdON/RJmRY34hL5Yb0dJvW0Z+c?= =?utf-8?q?Q9c1YjvdXrPoZz+IacnWcAO0HLAfMsuaO6mH7R5Jep4q3y4323FRrl4bdKy8rLKVz?= =?utf-8?q?CvVb1gT1KVgsUrhbhQFp6/UyRZ92qxKKJjqjiyHPXjsAL8h+9GChUzLiMuDXXX9S4?= =?utf-8?q?o/wuA0RccQGr+NP1cgEOE3oMbKEu8xaHZrocAWKT8boyt71Ec7Gs2G2pG1jxhxxMi?= =?utf-8?q?03llMJhot+GESURODMQeYXGqj1epYpxXfdIORizQ9uSdt80l0p7qJFbRQG7UDm/cX?= =?utf-8?q?0JXqUMPZNAPs4k/CBnlaooSJLB3cZQe6nX0zH4CEO937iFGHLKHjls7/SdVtA2DB/?= =?utf-8?q?uiXsHwHdBXNXiYCUpYqTXgEVxRDQcsF+FsFJ3qw=3D=3D?= Content-ID: <2E32020814D9BA45A8843D8AE9F6AF06@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: e5b6ef20-7217-4bd2-f587-08dc0b40e93c X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2024 03:14:19.8380 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6717 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/psxstr: basic FPS detection instead of fixed value 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: wQpKC01gemjG This fourth and last patch is an attempt at removing the hard-coded value of 15 FPS. In patch 1/4, although it would render video, the audio and video were not synchronized at all, now there are. In this approach I kept it simple, grab min/max possible rates, pick min, clamp to 15/30 just in case. It appears to work quite well, the right frame rate is picked up and both streams are in sync. (tested against Wipeout introduction for both PAL and NTSC versions). Besides, there have been significant findings over the years regarding that format, specifically: https://problemkaputt.de/psxspx-macroblock-decoder-mdec.htm https://github.com/m35/jpsxdec/blob/readme/jpsxdec/PlayStation1_STR_format.txt Maybe someone versed in this topic (I'm not) could further improve support of this format according these docs... Signed-off-by: aybe Signed-off-by: aybe > Signed-off-by: aybe > Signed-off-by: aybe > --- libavformat/psxstr.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) -- 2.41.0.windows.1 diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 306a690f52..98897acde3 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -52,6 +52,9 @@ #define STR_MAGIC (0x80010160) +#define MDEC_STR_FPS_MIN 15 +#define MDEC_STR_FPS_MAX 30 + typedef struct StrChannel { /* video parameters */ int video_stream_index; @@ -65,6 +68,10 @@ typedef struct StrDemuxContext { /* a STR file can contain up to 32 channels of data */ StrChannel channels[32]; + /* trivial FPS detection based on sectors per frame */ + int fps_min; /* slowest FPS found */ + int fps_max; /* fastest FPS found */ + int fps_val; /* nominal FPS value */ } StrDemuxContext; static const uint8_t sync_header[12] = {0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00}; @@ -150,6 +157,10 @@ static int str_read_header(AVFormatContext *s) str->channels[i].audio_stream_index= -1; } + str->fps_min = INT_MAX; + str->fps_max = INT_MIN; + str->fps_val = 0; + s->ctx_flags |= AVFMTCTX_NOHEADER; return 0; @@ -161,7 +172,7 @@ static int str_read_packet(AVFormatContext *s, AVIOContext *pb = s->pb; StrDemuxContext *str = s->priv_data; unsigned char sector[RAW_CD_SECTOR_SIZE]; - int channel, ret; + int channel, ret, sub_mode, idx_sect, num_sect; AVPacket *pkt; AVStream *st; @@ -178,6 +189,18 @@ static int str_read_packet(AVFormatContext *s, if (channel >= 32) return AVERROR_INVALIDDATA; + sub_mode = sector[0x12]; + idx_sect = AV_RL16(§or[0x1C]); + num_sect = AV_RL16(§or[0x1E]); + + /* compute FPS from sector count @ each new video frame */ + if (sub_mode & 0x02 && idx_sect == 0x00) { + int fps = 150 / num_sect; + str->fps_min = FFMIN(str->fps_min, fps); + str->fps_max = FFMAX(str->fps_max, fps); + str->fps_val = FFMIN(MDEC_STR_FPS_MAX, FFMAX(MDEC_STR_FPS_MIN, str->fps_min)); + } + switch (sector[0x12] & CDXA_TYPE_MASK) { case CDXA_TYPE_DATA: @@ -200,7 +223,7 @@ static int str_read_packet(AVFormatContext *s, st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - avpriv_set_pts_info(st, 64, 1, 15); + avpriv_set_pts_info(st, 64, 1, str->fps_val); str->channels[channel].video_stream_index = st->index;