From patchwork Tue Mar 1 10:04:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Chuan X-Patchwork-Id: 34557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3528214nkx; Tue, 1 Mar 2022 02:05:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMcwyiPMjSEM1vHs3ebP7dY7+11WNOoW64+09j/kGwQ5Bk6e8rrcdudCZ+As7NQf0z01NS X-Received: by 2002:a50:a68b:0:b0:413:3b43:ae02 with SMTP id e11-20020a50a68b000000b004133b43ae02mr23411563edc.11.1646129107114; Tue, 01 Mar 2022 02:05:07 -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 u5-20020aa7d985000000b0041179154700si7501434eds.141.2022.03.01.02.05.06; Tue, 01 Mar 2022 02:05:07 -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=PFcnc6th; 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 16CDC68B1D1; Tue, 1 Mar 2022 12:05:03 +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-bn8nam12olkn2058.outbound.protection.outlook.com [40.92.21.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7673468A89C for ; Tue, 1 Mar 2022 12:04:56 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VaP3XK5MLqQL61aY5gAs574qn7bDWH0VZXwKnt9rKByNEZXyf8ZBZSoAC8K2gPG/vBKY3kaGE9pC//aV9j4+Zt1ETEo1hjLIEG1igJj4BI+6b2V5hkgI1Pk9/YHy38fb6vosZkJQX6rWyGIbV4C+cX++ww2R5eHTn+Mu6I5610tULUMYYH5cQII0wObli+kJ5OY65hxyfJbRNtiW9pCBRJPy2esg59nIe6f2W3U43H9IkzZDyLOF/Pslv7iLHBFATm1bk1I8gLOkWWeKWyvYxWDMmgnuggpWwnMxQyJyEUZtaSqM42e7a8EePwHpg0+qq4hkzqd15EQz/ZGg+X6+wQ== 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=GJQiubLwSYGq2CtYuQdSSTVpzreAOK4AeEAMPbNWNH8=; b=ggHnE4lDYC/os3AM9adYZNFYBdWEzEANNFxuYFmUfNJxXTs8xtwxLsJm71+0v8mmh/9fD6sdSt/Rx4Ccr7e6pNcWedbw/8LxaUPlyiWgsAB72gS9YShgC4BoFKwW+14Sc35O4pvPt00ePY9VjGx3JCEBjkqmcknFwe9RsBHBKwd60kxBNXdBipEr7cM8oU+uDueJfVdlds/nfacL1G8VIE5OZREdNsDAEWaC8JJQnb+mWL35zEeq00cwr7l6OnkrnxgEW50ExhyWYhPm2S0lrZ+hk59EMmhvdwveMHSHZ9Q0URvGjLt8muF/YwzYJwMvs5tBc29hWLP26Gszh+4TMw== 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=GJQiubLwSYGq2CtYuQdSSTVpzreAOK4AeEAMPbNWNH8=; b=PFcnc6thja17KkcI+AgJAYg44p+VRAERNexlCdDvsSvxq5hDzUGMFU/VaMwV8uPgpOWlIuv3ZZsVy+7PMRFwK+BNLyJchM6j3odVXGOYspTrhakvCUcCiAVVVMfoRySl593HzerNwrq39M68jqsrwbREAYzDg/kVTDUSVWiPJev5R5ZhLIEZFxiwWrNnr7tgY3Vt5ly6TYfWx2pmiDerbWJYJRLozXyKdDJuodUOHAGb7+NdxovSKnnRfIlqnCnz7eUCKiKZ6Sg8rnPGwwunBHg6S/k0Z/gaDeT6vq8wotpvAwyFNHqdDmQsb8G2P8NYjicmDKj5eUekSEcDyuaZVA== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by SA1PR17MB4737.namprd17.prod.outlook.com (2603:10b6:806:198::8) 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 10:04:53 +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 10:04:53 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: add unified_time_base opt Thread-Index: AQHYLVPLkMrcGmHBbkioyw6kCtMt/A== Date: Tue, 1 Mar 2022 10:04:53 +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: [F9k/vckY6XxNbKvDXItges/r9fPnNyIM] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3d1b88e2-d936-4088-c5c5-08d9fb6aee6c x-ms-traffictypediagnostic: SA1PR17MB4737:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: x5R6m1UEDUCGDAPFsRORezLEGePyIzKTEM4YLO5B+H+W7rB7E6wwMNJMzrU1JhY1C1DJnUUOYQnY6PdMBN1uggnKpO80UyNcqlCT06PEeiDZWVCFlGMn0NPwrieISf3g8PW789v2i5LXP2eQu9pje6CQcAr195DrmDFxIXgf+Ydm5wH39KoGXEvQ9j7v0q07Kc83ziiPlGXqN9zYI9Xd2BGJ1tLBBN8vKkKi+1x2y7Co4HUQNDfy+2lQ1U5tqU9vzw0ddCw5qliJ/opz7opL0kC5G/HWDYgwBOGtmlzgAMV9kcrpTsBs69RBY+DWMLEmC38PEjChdygBsfbF+F2iL6NA1/V0Vok1+oe18qSJ1NoqZPAuhYZWErYh+TnNXTGMatm4878z4DyAPLd6gCpo6HanybF+/Lo5FqazOoesZ8v6jNNMr14yhF7Cmv+t2Ej7Ky3pkUukqVxW7XWRTcfiYHl6at0V4LwI30HxsqfTz7G4H/FzYNo60hDAaKKTKT5wo9YCRAJP1K9DVw2ILMB6dliB9WDw7KJiIfTi9LDfN4b+CEig0WSoX+zZcMSZRpEcCVNyTSChnUBccafnW7MT5Q== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: Ull+oXriFbgdM4MA9PJul+Xq2DpSBMZCo8El5TeP8pRWM479y3uayB1F49e/nJSS1jp27omBJpziI9Bb23OmK3dEJOdWqD1SOVK74kDwFDWuVMuP2ltTSYjdXNoqa0JZg9+7Op8U9/avWvdKc7hkVgWNOT5Iq5nTMn5CPKt9HS25n5H9HOekRP7/4n/HwI71/I8r4YgoqWaUs3n4Vl/ULuHzXZ7SbfJjFrZ/ucY44CiOM5yg/yH9SlYS8sl4rMOc6qlRzAzIrg8ZNCgzbA07x9tUFLdtRZNUSVQ9dOTJJgTeGKVzL/26YcJYhe4J9ivPH54pmo7jWgVN+LqeGUeOwSQmaWApviay8HBQr1u0rqwcKrrasAzN9BRUDBON0egZ0v6m/aXsLBElEk6+LfhlVTZhUhTLEecF1ycXrywfzZeErtks6IXtqBs36Dl2S5Nxhpfy6cU7Lcn3Zoxv8TlkoC+wxmXFNkKxVFAuaL9aqIxbN1w/CfVqfXZNUshsO4hDCchr+5Hw7CMUNusOOMzCuPZGqt4KsFUXsJQEQMGIrqvNjGaCHVIaO5zQsvmmwH3x8ttnB/QnHLRFOIG69AS4Oqn8A0NH94IKly/X/jDz69Mj8jL27p7FEMHtwO+LwnZ8RYZoBbGdB58pktuF4uW29YxZtInmBGj/WJu1616z3ehURCpbc3AbvqSiZKkS1AsvfLu9Kn15TgqeusWSK2Jp8SQEQH5epkI5Z3h6jKH+k/uX2556IEaHIVETBcDiC0CI2k4gJQ87YCSuP+W4n2UjXyTqPimzDMX1ONrfV6bYDWsNBKEfAzJIZ3AX1T97hyfqbg+jhXaR2Y5c6cLBBVPRI8nheRyS0BKGQ3PT0UemylCpRTpnjYLjFeexMns9z9827ZVobj1wa/QZP1ikkIfQ4ySBhnyWt6xIZ4uobYHMjAdZ54eWBhYsPLFIuXnLgKrL6ZEScS08uWVPTeEfQCzJTw== Content-ID: <72117BEA41EE0A43A7AA207DA4DBE385@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: 3d1b88e2-d936-4088-c5c5-08d9fb6aee6c X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 10:04:53.4222 (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: SA1PR17MB4737 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: 4tu8maj/ViYE 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 } };