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 DA15A42275 for ; Tue, 1 Mar 2022 12:56:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D7F568B0D5; Tue, 1 Mar 2022 14:56:08 +0200 (EET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2104.outbound.protection.outlook.com [40.92.18.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE8D868AF0A for ; Tue, 1 Mar 2022 14:56:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L4weke9L1WohBFFIuxXStbKBkKrNpq3grwd9EadTnlviC/YT+fEmwuMSHSn2isc0ffOLvUxR9k8rzBiVT1VHTv0B+KL8TrYe0/J5X9vNDQZe2ts836QPUVXWAAitzu7wcGQzVJlTDxX7736LdRHvSqoY33EVU7TAnOaoiAdyx1RkyTVqMDac6u8FpOmbHgZh3cMokEOIedMTQLslRkCw9rqDHn94cLOn6JCa1IEVEpaq5wBxYk/I293yUDVnv+9i7WWDhGvUiUMR5P2D8eXcESNhKAeRxjpv4kRwPSXRRtVVMgszJ4B5aHW6yGj0L9Jq7FdXiZ4fVdJXLKayXO7y7g== 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=x1YY8t1m08LJS7MeeJ49azflSqBPwuA0uPhhdTG7qK0=; b=Lv0c0OaPUrrYL5GjC0LGo620YAV84BUure/UtcKLcwI3aUHJOy+KC9+IDVXcPqzchdznnu4m8W0sZPNivWfHQYUVKkRvuIwx/hU7oFwEOJ2L4ab71pcp3r13DZwPHxEgGgT/9Tvp3vtr+3nFoCql5pOr5jlRveLCBsu0vXaHYI0M1NyGPBYJU37ObEqpaPzb93QVHdyLSdA/bQkQHL41+XDMTabWPhfGtva/Dm9MR8/zVpvjWim6cU78qYNMV9J/PzNyMtYuxeRyB7xTsHudY4MM2tRIE91W+XBht+fYxpjq78ffCn3rJVDnzL91dEnAhIeE9vi4jGzu7d3qio4/jQ== 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=x1YY8t1m08LJS7MeeJ49azflSqBPwuA0uPhhdTG7qK0=; b=C03Qx6GVFPv+Wr+SaUJFmBut3vtzt904boahNka/6T5LwSeI4jdEY9zwVPEHcllHR/CcZWIMjCz+uIlhUflz+Jo0DqxhXJNJF9g1Zunbqmy4zeZIfe7hvFOK1zmB2lfM2RDDb8n9scr1W7U69YdG8uB7YA7YdGN7vBja+gwnP85AIMr9jcn6lRBqhf0f4xCpy5CyUo1Q7641RAX78/c5li1hAWbjY8tlKl9dyTjwKYJzv8yvLHKkE66v/tLnRG117irpTUjEVo+bM8gcfyMPMnH2OyjHQaHLm94CVPW9+fbGCL0iixoN7kQVrZ+IAFYBRh9kZ5tEBxxTQkCqEbPrDA== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by CH2PR17MB3576.namprd17.prod.outlook.com (2603:10b6:610:47::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Tue, 1 Mar 2022 12:55:56 +0000 Received: from SA1PR17MB5122.namprd17.prod.outlook.com ([fe80::c532:34c4:902:d206]) by SA1PR17MB5122.namprd17.prod.outlook.com ([fe80::c532:34c4:902:d206%5]) with mapi id 15.20.5017.026; Tue, 1 Mar 2022 12:55:56 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: Add unified_time_base option Thread-Index: AQHYLWuxoHE2L+eZpkCKo6mVu8Kd/g== Date: Tue, 1 Mar 2022 12:55:56 +0000 Message-ID: <8CEE7949-3F4C-41A9-8336-E2BF4B2544A5@hotmail.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [A/PSApDeezpGYyJRmnM+Delm9sF/N8wr] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9051033f-4de0-4872-1311-08d9fb82d3b8 x-ms-traffictypediagnostic: CH2PR17MB3576:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Tam4yE4s0bv3bKmvz/7RGr8YKRQG28rPvb3ZUsTsQ3NHDYdjAGtcWqfuNbUUHqJ1ve9O3Sk93VYtNgVBTLMHnq2mhpFKJZBZnW3cs1GTcEQBFNGYzI2BVD81f5PUFBg7Yk4eXrKc7idE6MTHqH+iV32DhQ0/JQtovhSRN57KT2lpDOd0rTcEaQTRNiEOExjGTfuzoaBniQXKcpi05emGj56PvqMJYV8eBAmaVswm8RCLhEX3HTXidbIbAGvKT9JJepri9QwbDLKKvTgY3yJ7BHCs3InmQKjvNog0FI/ki0fLSJ7NcF381vQiBR1O+SBAxZmAXcVCOnvEYBDKeD3UpwOBpVgpPWFsjwePcnLd8SkDAJ3TkWChFOMP3tzabyMOXueXTEnZX3cvNqOUPtKK71vqLSmOdKKtZWhoWtiWHA1oeDD+KAP4pIgFImUrhOEcu9EL3v4eftLfV92m3/ZarI04BhhqcBFXmU6xcLlpCrUMaj4bbFusGgFtMWmKjUQMvs4o1iAGD6Z7kKaLgKmgRu0O5IYEeWY222feV0y5/LDZ/CHgV+Iv9tYLeTGWr+segPcPolIOMyoZCydkODzfZg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?UpfiKya2IPZPUL5r2iQhWFJdCxltDinKLHxJznv3JB49z05+2L4lpCMrtUsO?= =?us-ascii?Q?9SCbJ1U19S2jcRbJNRu2qHYPNefHyfQGgyt3H9R2aITVxZLOrIM2BTGBH8mX?= =?us-ascii?Q?P5PxvWFDnPACq9HrDL77EJxUuA61HUu5JK73nnDWJGEFN1YmuMcVtZZta6lE?= =?us-ascii?Q?/nEg5gYhQLSBBHHzzCakI22E1wJwI4hBu18XqeHIeATseEsy6cY+7PCKcynH?= =?us-ascii?Q?X1YL3nI3L4XET1L3ATIe2oBgpIcwtOeNo2l9VvNlkhRQMf8U1BAHdmrBbAkf?= =?us-ascii?Q?IP5TFN7MX8DTqzeET7cjptH9l+rGre0TZbbxFVQxSAdt5D1o9yZjI9LXNWFG?= =?us-ascii?Q?kRViKg03T1C16x7uP/UZbZ7wMVIct9GDG2Znb5GB8+Tk0WEutwPmf+GPjLuB?= =?us-ascii?Q?W5uHK5ZDyYTgvF2uAu4x2uy7y1Fe+k/hCh/SIz0Rjpc4Z08QxIgd4B57+spd?= =?us-ascii?Q?JmzX4QFwn2QnahQBYhoCG+k24ILSg1bGYnpKlbm4soDRwPM598F3xRp+pYKL?= =?us-ascii?Q?sCIVQFT9gxJr86aSRr5LSDA60+eqHFeuFMj9WuEyLJwEOSWjVZw3BtiaEoaY?= =?us-ascii?Q?6x0P5P5Z+fDoSWcWEd27QBbEi7TzusLJ19jtkjzU1CAlNp8TaIXISfG3jB2M?= =?us-ascii?Q?2XmeFErHQckpvvzmOmpbro/IAnJJxGDLbRaJ/3vtjwHxdou0g3JOsxZHQNvk?= =?us-ascii?Q?nIjKXsZwRkWusbC2VwZHIwU6EVrREC4Rd2wWtYhBezpwaa3EtkJlBWmLUvL2?= =?us-ascii?Q?F9uDr5rZ2t2MsdZYsEevqBGTSOqpizUBhJsM/WPe0hriJny73RBCQVQ2o8NR?= =?us-ascii?Q?Q9MwhaqQFDivRNzy/ZOj9Aarn6YXL27yTDaK40j4dokYANsf/W+MY2mcZBps?= =?us-ascii?Q?8rMytPDd9F8RPuPX8bxKRlZ4PLRvQZCicNfLIicAadiwVIj1CO2ORZaro2ca?= =?us-ascii?Q?SmMG9sgWhgO2DUYtKfOZCg=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-c704e.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5122.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 9051033f-4de0-4872-1311-08d9fb82d3b8 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 12:55:56.5374 (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: CH2PR17MB3576 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base option 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: In some case, the input files have different time base even though they share the same codec and codec parameters, While processing the packet, it will adjust the pts/dts by its own time base instead of the unified one of the output stream, which may lead to wrong pts/dts or unexpected speed change. So this patch add the "unified_time_base" opt, which could be setted by "-unified_time_base 1" With the option, it will concatenate the input streams whose time base are different , and won't course speed change issue. Signed-off-by: Chuan Ye > --- libavformat/concatdec.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 0603c6e254..2cb656d87e 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -69,4 +69,5 @@ typedef struct { ConcatMatchMode stream_match_mode; unsigned auto_convert; int segment_time_metadata; + int unified_time_base; } ConcatContext; @@ -782,13 +783,27 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); - delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint, - AV_TIME_BASE_Q, - cat->avf->streams[pkt->stream_index]->time_base); - if (pkt->pts != AV_NOPTS_VALUE) - pkt->pts += delta; - if (pkt->dts != AV_NOPTS_VALUE) - pkt->dts += delta; + if (cat->unified_time_base) { + /* replace the pkt base on the time base of target output stream */ + AVRational output_tb; + output_tb = avf->streams[cs->out_stream_index]->time_base; + delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint, + AV_TIME_BASE_Q, + output_tb); + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts = av_rescale_q(pkt->pts, st->time_base, output_tb) + delta; + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts = av_rescale_q(pkt->dts, st->time_base, output_tb) + delta; + } else { + delta = av_rescale_q(cat->cur_file->start_time - cat->cur_file->file_inpoint, + AV_TIME_BASE_Q, + cat->avf->streams[pkt->stream_index]->time_base); + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts += delta; + if (pkt->dts != AV_NOPTS_VALUE) + pkt->dts += delta; + } + av_log(avf, AV_LOG_DEBUG, " -> pts:%s pts_time:%s dts:%s dts_time:%s\n", av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &st->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &st->time_base)); @@ -931,6 +946,8 @@ static const AVOption options[] = { OFFSET(auto_convert), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, DEC }, { "segment_time_metadata", "output file segment start time and duration as packet metadata", OFFSET(segment_time_metadata), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, + { "unified_time_base", "adjust to the same time base (from the first stream) while processing packets", + OFFSET(unified_time_base), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DEC }, { NULL } }; -- 2.30.1 (Apple Git-130) _______________________________________________ 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".