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 42A1742266 for ; Tue, 1 Mar 2022 12:26:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AE7D68B199; Tue, 1 Mar 2022 14:26:55 +0200 (EET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2049.outbound.protection.outlook.com [40.92.21.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8225B68AEB5 for ; Tue, 1 Mar 2022 14:26:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q40zTCg0FcZ32ypGDIcsOe9zlG9LXvH7dPPGPGjgL1V8vJpw49eeQuCkTnIAJQzVrEQBr4ONBPoxR6d8njf+gfPj9bx6SlaXIug7mQDsATOnKqKqt0KR/amOo0dsWj92vLU2bFVa+p7+c8rRzz1Jh0XxeE419hwiZsTZCL8AeS3lXNRKQ27yi5h75mXfFnd47XUqLUHEwF7sQA8i0/i5ohBveTVaE0/8fO91Y973+4oBifQvEq0dH9LSq2saTn2cJJ4Xhyb04Ken9uTeGQBAPT3Wfmnqj86itvB9qu9Bu1K5vvHk6yNDHRheVY/ZpIRnfU2sefA2Ud0SEcF2J6WEbg== 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=5Hhl1MYAhT+HNnBMDZO9g7yLkbB1Y4Yw9sFoMCk67TM=; b=TXyBkGrFuLGGvf0naxOCIrssBXNK5XuOfnXFDrgFhyokxRrmsh1hIuD5jsMp1wrejN6ps/JuKje81anwGIWMSbsBJyl5IVKt44+ZFyjKhOrxod8MqAuwLW/feiQzy0b2KwIIvK7Wou3Jer7kkRPmxSYqHaH6AQxtdThRp23b+wrcwhnnk2x5mmxUJslEmN/Bv5XiPTtzcqcM2of6qjONkycwN7RT0ceG21RxwtPJHZ5G7C+HMZ55hDk4cCDZwkHRIW6DcS91wc5IID2XoZxg2etMdLRnhKAZgoTuojuIOJ0rysGVtnswl3/cvvlzMdCUWo2+q+PatDXRNNhOSRsqZg== 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=5Hhl1MYAhT+HNnBMDZO9g7yLkbB1Y4Yw9sFoMCk67TM=; b=qmT3YEopvLFo0fNEqpvIUPOF65ograzkf3ZVjJ2qLCHWJUgLtPdLV184z6hJ0/qcjtydJXoAKNlXQfeV2k5ryeIVAqxl7S4BQ7afALe10xC52Lk+MxsNjpxwiBjDHyEqUjtwOm/6RNhIZxFDI+TrEmZ+xLpuzoAbjehb+CauDr7gGGgLv29c2b++Da/tlGvMB+4xhHjt8OHu5ngSTcvKc3A9iLrexX0Aeg3PQAnkiyfS8x6231Ci9NgYtUoSspmjMLosXNvT2OfZ+z3rTV0kP1ckGoHVeskJODUimyZQCOhaSm9y75sw9I7nooIzUsqf91wAqxI/EVkeNVyIBks15g== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by SA0PR17MB4457.namprd17.prod.outlook.com (2603:10b6:806:da::17) 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:26:45 +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:26:45 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: Add unified_time_base opt Thread-Index: AQHYLWedNjri8t2Aq0uJ/qyzM0JAMQ== Date: Tue, 1 Mar 2022 12:26:45 +0000 Message-ID: <8AFC6713-4843-43A2-B684-1B9443F07B68@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: [SWqlW24LXy31R6kIabvTZQn+/+lVs/gs] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 177efb17-fd02-408e-0873-08d9fb7ec042 x-ms-traffictypediagnostic: SA0PR17MB4457:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ybzBVAbTUH/LItTJuU3/B6LsZJviBJkGQXfHfBLt50U8q1vSryM4YziJIwUGibAoAdq+cWEI43uPR7yrBPJdwdN7GvgCTpt5mBbZOfhSPPVx/xAaqcYIl/dZR0vLg9SYdqeWafKgn1+WfzKfrwhem8hlIbRoer8geBj7Wdul9Jd6bonlY6H10j6mq3P9faTgGd10DvR49KT9xV5n0yL8y+xwGZmdofFbHurMLDD6nFpZfHKcmHaEm09yLsumKqcJDL3pRJbRyCPZ7Cw43rjeX/kbgdq2RPe+1hodGoN2BNsXzfWAJcc0CZEogUk0GwwCDeL7ZS9dGkjWI9Lz9cA2cWabWwDZYIFD6KF6j4/CyovqJI+F03fDfn1a8TChdNwvXkyxTGNgcskp3JKjeXJh4RtEWUgHcD55ttaCqQS/UTGymLtGzOxmY7+GTTmakT4ocy909PAncLdvDcRJDmyKE3Rky36Y/dH0PF3Q3ngRO2ELJ/Kt3nlHFqk2FCGU9CJwCGybsaSONCNwbZHEbUFoYRelA/ER16YZQY7N0XuG/nATz/TLx4qGhkD2vN6eB8huC4PuelA2eHGhoFDXK4mSoQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?d/dBrsR0g9nP35N51ZNhvOayazMbs/z02mObvBiqN5vOw1jE3RpUdKoAIqie?= =?us-ascii?Q?K3Bt3CleVRbdqoDBQXeclvFHk7cyaE6eg8EbxqgZKKs9vPzaiZTUXc8RhkOz?= =?us-ascii?Q?jH03d52+TE9sGmfbHbEp8ZeSgqsgWZaOp5GB+wMOT7Bd/sg0/MKtkhKLwLz1?= =?us-ascii?Q?CSF/nx6IeJd0OdPeOGpo1hLVJlgKxAi+BK5yyA3SMti2Z2V46NRAV+E1OWJB?= =?us-ascii?Q?iVvZ/usy3AtlSnBSgFuMbuFpfXHUTS2bMQ6viT1YSAEVlY6QDHwA+OPTTKlf?= =?us-ascii?Q?MpFiUKVLd0VcHOP7WwPin0uQJky7HxGvGBEFqKGM/NYudz4H1/NsEBuA3Yg0?= =?us-ascii?Q?tBeap0M5UcVwuiSQYjazc7wTzGq9/kxO3d9hOfQDn1pmA6ei2D/7p5J6QXKj?= =?us-ascii?Q?SOwEyqQZd38SA3qn1STP/KhZVRVknn2IK6SFRjphuIXOF+/azCyKJo67o6+D?= =?us-ascii?Q?2S8VJzxX2TdUpsuFgLJqP42rOp1rCLdM1Ol4+sDLVtXdgakiAmLgG6a7WBAY?= =?us-ascii?Q?UW8QP3HIlNd19dqv6/pu0jHyh6QzjMUdHAbSbxe9wUyvdWtxY0siccCPbZo2?= =?us-ascii?Q?lQ+t/kTOEAAs1cWyoSfI125D8DegA6pLgmiEt0ah3sgpd0TpDjSZUlHmjVWM?= =?us-ascii?Q?netXlwyvck1hMoCK7km6ZK1mIZFe0h7+PRvfKaYveWTad6vRrkOKtF6yIIgj?= =?us-ascii?Q?moHXaZbe5GA9MpwfQ+Hxc+/lnZ8oLtYrJhEDU0oYqZu655fCPG95RQb0CxaE?= =?us-ascii?Q?ozjUdO5CX8hNefi5xmzLvxnZd5hV1k7FhOpVTwkC2wlCZ8E20tzRfxUiDkIm?= =?us-ascii?Q?yuss/FF/EbR/Z+ZavXK7/Mvrs04KFWmpSfEZJYMsjrI61izGRQT8AAJPPXVh?= =?us-ascii?Q?ZAYm7cpKEvyLKq8Kq8ElNw66HgYsJIqSdJRx+FZLu7aLYw/n3ZSrkqExcyyC?= =?us-ascii?Q?k8RxAu8CIDPTiJrBSr+ZJg=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: 177efb17-fd02-408e-0873-08d9fb7ec042 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 12:26:45.9015 (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: SA0PR17MB4457 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libavformat/concatdev.c: Add unified_time_base opt 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,6 +69,7 @@ typedef struct { ConcatMatchMode stream_match_mode; unsigned auto_convert; int segment_time_metadata; + int unified_time_base; } ConcatContext; static int concat_probe(const AVProbeData *probe) @@ -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".