From patchwork Tue Mar 1 11:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Chuan X-Patchwork-Id: 34560 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3595558nkx; Tue, 1 Mar 2022 03:46:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJybOoRVM/B7Yvz1Q9yp0uGDlUTg7Wa5+sfwd8cujvBYNEYE/PYFWDfStXNr+2Di1sxR3Kq4 X-Received: by 2002:a17:906:bc46:b0:6cd:e855:18fc with SMTP id s6-20020a170906bc4600b006cde85518fcmr18321306ejv.263.1646135171193; Tue, 01 Mar 2022 03:46:11 -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 d14-20020a1709064c4e00b006cd342e460dsi7976194ejw.633.2022.03.01.03.46.10; Tue, 01 Mar 2022 03:46:11 -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=hZB49ume; 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 07CEB68B277; Tue, 1 Mar 2022 13:46:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2024.outbound.protection.outlook.com [40.92.22.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F96268B20D for ; Tue, 1 Mar 2022 13:46:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lf3IvqiiIvjMh1/FtmAUa3TwZ5nudHWZsofXl1WRWlP/9hrEbIfJxp/tJC/Osdo+twhyqiEWgwYD6ZR9CFdk8Sv+zgYEscFaI/Ww9YgkdH0O4ehY+d5wYFVC80Nu1lU0eX9QNWzwgJAxh/IYBG16Rg+1oA2rwrIYenmjxErXq6pE8Oxcx4ju0/IdadqHwHIHHzVNYyPZ5k9PVwOD1Hi4OhPuMZb/JLfxs5lrd3zL9i44WwrP3AVFgIO4AqkGtmj+fIJ6wcA5LGX2GPv1Nv/yLVOrSmOIloKnMuLEGejG6IJ5bGpZyom9WwrYxB6wxBGIm/JhPy3q5LzBkM5Gch2iqw== 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=C2j3XKKNCZwaUD57Ci1+V0ZaPFPgTAsn79LiY8WEIZjOzPzhXbVZC9Mp1REHnMrg3nLprjk7fnvvo1fxLv3pPevRwI5YYBwRyBTavThcKLpdD15qLeMMu/nf7Gh5XEzFqMcihO+Y+l2xEtdytQ/D0iMjHfFW/e/3dFGOFac6f9psQ269ubtHveI+WoSMM63HYryYPOyYq/epgrWb0G5rk7rejDJ2o0cNPPp7lZST5ZpVuPww/wzkWASg8t5/VvdftM0mF7Duune+DAInJ7GObW3Au/grrvKIx0MpCje179KG4VaOpNaQyd8V//izZZNFJnqszLWVhhv1pNqCecBeTA== 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=hZB49ume1g7pHkCP8ekGOvb45r7GGXP4oDGhNoX1p8DoAuFTJF0nrtJe195bs8WapYlmlcfpSV79izy9qlS8NxK4PzdNsmB0OW558HW4BkBqizazB8zKavEX05t3Ro361YQMosvRKQFcvGph1T188kA0lytLHsU8W4CmqxnKAI/n18ka8jUp0Wn3ynX+gkQCS8r7fdSm64RpJt8O1kSnpHhT1Rrgb0TbA4P2S8Eo/sNCkbKBGI3f09UoXdqHKR8IWpIC9603AI4s4zF57YHd46Sv0QAA7vmMckdR7iHuBPS1fuiEJEH2kPLTQpGE6o4QeWhsFiLgAtEQS53Wm8CoOA== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by SA1PR17MB4532.namprd17.prod.outlook.com (2603:10b6:806:1af::8) 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 11:45:59 +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 11:45:59 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: add unified_time_base opt Thread-Index: AQHYLWHrdhxJLw7sB0KS+B+cAM8fLQ== Date: Tue, 1 Mar 2022 11:45:59 +0000 Message-ID: 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: [aKOSX9zfqm37LuD44duEUFudsPxc6nSu] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1751f990-8fe1-4afd-70db-08d9fb790dd4 x-ms-traffictypediagnostic: SA1PR17MB4532:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: cKagCsSkNgU9nwJp8sglFrgdo/rMe7b6amfucW7rMTqLYUX06aQghqiaHcWIUblL42Qt2G8nEizPOg/n7Ve64+wRTeZr2bWB0IBBJDdh3Zr33CD2qaje/qQOhvxEAlEOZg+ZHacIh0cQZIfXZ5p8wbVFLGab9Px1zWdETT4RJdcgAvLExxxfZBLtMNWrxGFW907XwpwuamY1msrXJRmEJHbS1pSmliX5EzsrG4VEGJVRVPxVav3qf3V5fKQhuNf1EAAM/gHXdJ5AT3hj4g2l25U7SbWqfST4BMVfmt6mkrtcADvKwQ+XNjGLuyH+tn2FujGEdLRIMOvoMvJLsHDHuxZjeEww81bvwRlJX4oYDF2I0tNts5OfJ++KyMlmq3BLW2vbAiOd8WEeX++VqyFV41+2QIVNr9Y55LPhBKbfnDRXVQA5jZ86HhwDz+zmdNOhW68Wsl3aqwVc+YvBYCQA4kCSkGZIs/N1oWckVrCw08QP9/HthvSU++RYMsyurdNGx2JkZM6rtfqTJor4L2MaOPYxLxvnrBkPlIE/YAyoYiIHCCuZ4KIIstpq2AZb4CmwiKouAiOSqI1YvunYX9hUdQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: QWLDJMmYZ5/gTdVC1OtNv0+byVrgQvT0GO++nHgbzzeTssYfgzH5ppIkYwYkZkYiqVGmMf36+Md0kwG/S2jGkoTqrJJgyU+z5zck8TwW71MfqaxfTDpmJ05ZOr7HdFUdI/AvFKyz2LNoHAG+LoJ35HKIT7DpVKkvZAm9wCVFVJuZYid9cksSQlexe+H+yECRq0ME4LCfjFtzE5HBMf3JjSF5QD4Pf9Z0NjW57Nyf/TNKTA6B994vfF/G+krpUZbqPMEWybKx6zXVuu9QbLqZ4wHce1qbbytcHpRnZp4aJv1/c4jM+bGWxOyHSrwA0mnDv+WQxBWXiYyB0pIA+pdwPlC8P3kMVs3iw4UzU7BhuTTJ/aWkFu28ZnAfDKRZx/4UiaWLIdliPb1/mZFPQnr2tQ5UIBC8ZIc3GmnvhrHjdSLs26Uvf5tuQnuNmS9ZYLHaC/tqmceX9zdpwM5qbq+nHUD1Fj/L+bKqKy7G8EkauIeqj2qo1oVUydco5M1h2d0Mct9SLutTqQkE6ay0d6vZJy1scxfAYcePNfeg3POwDfMtdGHr7x5aTW8V9TYWlJ5v2B9VICZdE+UzGLejqUp+nx/sBkldbPyJ1o54Nfg+Wa0PvbiLIEw3KjEsOXGDb6lRJ/tQGk1UIEj62TxvD/epEsQbgJRwUyeVOr40XzkRrfnhSPlIbbqQKo3eL+FG6GDuv5rkHQQv/BLPP3utEP5v+nghRqNgYj0iSdMtl7VOGxw5DCkJpix/58BVlgOZafwz9McjPAdx0Jtz0LXJmYDSV05LnzGfgPg6E8L4OY7IJ4toYCcmxA0CYYLsSIpyIqsHIosJ0kCldN3PzCVK2V/cLu1xwexo6fzWVTZa9ImljyrfFjlIm9prqSILSBfEQG4kHrQkEyYMfOgh+CtKsORvcjz8IrDSjnQWxs7vkLnfEi2LRRTe0PpDS4Ps09Ic0YwzeceHNv7vCsDcogKlm52WWg== Content-ID: <52974614ED0AA44DB31512B15C712A9E@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: 1751f990-8fe1-4afd-70db-08d9fb790dd4 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 11:45:59.0651 (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: SA1PR17MB4532 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: kRDn8O1hHMU8 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 } };