From patchwork Tue Mar 1 12:14:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Chuan X-Patchwork-Id: 34561 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3617216nkx; Tue, 1 Mar 2022 04:15:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzz0BtCYILx0IXFcbcjmB76WaKNNub73LKIp6pRHnJVmn7Z1/3BchiAx61lTDUcJbKaDKLH X-Received: by 2002:a17:907:920d:b0:6ce:a6fc:1ad8 with SMTP id ka13-20020a170907920d00b006cea6fc1ad8mr19090070ejb.448.1646136909033; Tue, 01 Mar 2022 04:15:09 -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 m16-20020aa7c490000000b0041124e66867si8218287edq.542.2022.03.01.04.15.08; Tue, 01 Mar 2022 04:15:09 -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=BhxCRCIU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95DB068AE64; Tue, 1 Mar 2022 14:15:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2105.outbound.protection.outlook.com [40.92.21.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F71F68AE64 for ; Tue, 1 Mar 2022 14:14:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ULFkH+9L2IHMIRljbJUvreRYw0C4MpFuUMvhv/3bKbHNQ9PyUfdp/RT4msODQJYqDfL/x7jWiKdV6c2HjIFN4fNUa0kKEk4PuPpJE471RkD+f8se6e1e9E/4c3TCkErN+ZiPRCtyfoqYcwLALzS3ID6GICzqr9UUAWrYw5hE+Ac34txn7JeyJbCViT6PAvNDJtkvMYP0zoCdBlVJ8/gRnL6Z1PuGYvkTqQ1E8e87LYwkuoWdSWqEHt54MFiIxYZTcnF7b/9Oi9Ng4haGBB+FNqpGuqZDxEEjv15Cddv/8prx+nJrajC2Mz1oK0bPVa7JiwNJrvGf9lEC9OumfI2eqg== 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=1HkN3jrZBdHwKlORIF0wcBZYJlBmEsIQ4UN4hYUj3oE=; b=Uf8k4L3PkR9eqqYjEAPbpCLkbpd+dJitYFAMvGs9q0urlGGpIKhRpckmZIDEFaX+I2zLd8YBYcVL0Tbz82ZmK0Av+OvPhMBABzcmdEd3I7RQUGbDGzpD5pwi78EZ1EgN2171g1q6WT8G3EBWxQ5YwcF0jvJ9q1EcohITN7LETF71mSwAPDBIDgqJfb08P7BCUXFZzkufz7SIYErq4jdc/EXt2oWuBurcy3IfS7BixrvCDL5XYUfvf1WiZp7uD0zkTq6IswIGYHWWcw2sdnISQqq7NfMrdURHTCjBvcVXR/Oh27Op5y2mYPP8Nl/o1PF2iy+xv91t4fOLsP8S8iLt5w== 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=1HkN3jrZBdHwKlORIF0wcBZYJlBmEsIQ4UN4hYUj3oE=; b=BhxCRCIUV9QIpMIFVaHOjrKHARXGJSfUBeiAGYQ1GE1Bb1yyzsXrH8ROhVqAkvoYCdOn7ruSspX5tKrbd0f27KXwgowCiZ987nx6OwZUYFyGpuYlpRIom+D+QNGuIvDu6XV8o/3JSWC0hIn0IHV9KGjFsC8YonITqO0+QLldZSLnUt8oaAaaOlKwbe9ID2RF+utMBWG/+wJQ74+TwupKMJrDFffQoxmHbxkgt20mxrqM7LuhMXvQoD3p+Yr8zpSfNMNHmUpqQwm+ycPrk8C8Zodo5dg0MKZcnh7AM6n+In0TT0dpCkTnIzkCKEI0tSpy39lUTpNsp1L7LehWrnoAKQ== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by BL0PR1701MB2418.namprd17.prod.outlook.com (2603:10b6:208:31::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Tue, 1 Mar 2022 12:14:54 +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:14:54 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: Add unified_time_base opt Thread-Index: AQHYLWX1AR0VjauEgEGE97sxyvZEjQ== Date: Tue, 1 Mar 2022 12:14:54 +0000 Message-ID: <9B7328D6-3555-4D18-B8F1-78EB362B8358@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: [ChRag8e27xZ99LBEf5wnqYl+jcRrkpta] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b21a8753-6c01-4111-3761-08d9fb7d1867 x-ms-traffictypediagnostic: BL0PR1701MB2418:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ha9nbPZEZViO0SnJQpWIw0G+VxeRaXt+XohP1lw/HS9JbZpwtsphEb3RyUHXHD+0BNqLp8enmRJSpkMYcPvG3nlZHvMVjlGBk2ddgTd4ayY2lt/S+Qph8NXFeiwQNF7bu5raA8KZop3FUpwr7Iolg/LZJ19XXfZUzmn9Ehn+7dKOlNyvljdnQDIV+zfuaqTC5CgBX+79fDxdjWPDmi0jCLFxl3eV81FByAcjQLUns45PZp+C0PONUKPwXSHzDm75YELw2POTB/X6Rtta0JCoK02wQ3aSXvQu0ZKt96o6sZ/m+QADp4abHyzHvFYVPMIBViUaFRzpTJiJkuyrKSw94r1KdnQxG1zcNLAk0OylB9zn9u4hdAde43/nZ7Wpf6/U+pcseq8hDouuUfMhZFJEqQ71yTRtmnRk3B535NFMv+Swy67qEC2QOpD2fzBt9Q4XsJYjPj4Dufc8ye902fwU35y2YLBoWhKLAHyr6ehy60du0glKusqNuQDfmjfzHW/W9OAcrr4iprpf/GXxSIxpSkt54bLp8jG4Z4+ViMErQCqTOS5vk7ItOEKJWv9OL/7yksji1If/GhZwChGAUkeJAQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: W/hiOJvOvYewBcVay3s2Pbc63vhHZAE6IP16DoA16pKIgSWmaEa5iDqazQxGo61iZ9zZczjcs4npvGrJNY3Km5R5fMS+3ldiHAT2aC7fNfGCtG1gbK+YQdUbxjbnbNeCHOi+Stxx45tpWdXY0/Ij7LgfYC3yWqZpThzotlb4CiN5o198daAvLdxv+GQCU3GDVdMtvtEsnaeqUs/FTY6tXAgpqF+Va1tMZCOfTTy5p2xaF/7w1XPLmMlaXWM8XL8pIH/G4sMCy7/jkhjz5TKFqZBUFLo6WMuzMV94DigDlm6BI8ODVODnavLj0KOwq3LBdzbYSR2hSfTVSqUGCl8fq9uPBNGdnsWGUVTPZ2KPjKJPIdC7kCGwTUZW2oy/NYp3GfC92Z5Viugbi1eyl9j2GX1DdctrePvPIaOKdIjfrwicgFh8MZ2j8b8/A8GROoJnMSRrhljeFYTzjYK/I5d6XqO+H0W9WC+W9JjkZjjc17zdqV2PMdEz/rRE3pH3ldul4VbaEZqyvvt3Js+IfFQ8Q7nDD/NS2GChrIr6VuKKJxc4GgqZpe8GvkgcgCeG1mMb4Ezx8zFZLGd0OcWlk2ALHTivQp7dP1Q1DUOr96dcukEXr/UAXDGnt47OFpqLfQlEUo5bo6oobGa/h8wOpW3NmG1y1S7hlxjFpisLozDqXKtoxgl06H/rpQ1LKbdkWa6GSXteQJjdO8q7oy4NOj0r7i2OKBVdzTYMJx4cEgJsbZ5WfD33thWSQbuw0iodtkETVmm1K/qKo7oWnmOtt8jIN7FsUBMuTTRfaxzkjTb7ma7hYKjSttp0q6Q9eUlIZtR+E0lsWCzEt+cnP0DMewoIrV0MUNp5AMqZaRqBnybA6ijd71QOCw0p6zMOhLiM4LWANK88lHGGk98jc/8JFZsbjuoFuvX6G3+CkjKlqU2uuOMIr62x975RNBPOdzt8uzU8nG01qzAa+bl9ORGgYMMp7w== Content-ID: <8BFF041D61AD8D45917E924A902F3DF2@namprd17.prod.outlook.com> 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: b21a8753-6c01-4111-3761-08d9fb7d1867 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 12:14:54.7912 (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: BL0PR1701MB2418 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: k/eaZTQ1OmBh 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 } };