From patchwork Tue Mar 1 12:40:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Chuan X-Patchwork-Id: 34564 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3634781nkx; Tue, 1 Mar 2022 04:40:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXFHdreVNKVSVoVqAgFvOX7JMP9AU2XArO6dZe5SvHr0gibjFvjQ+O6NWxiYcK+3wmSGST X-Received: by 2002:a17:907:6d97:b0:6d7:49e:275e with SMTP id sb23-20020a1709076d9700b006d7049e275emr1103771ejc.410.1646138432322; Tue, 01 Mar 2022 04:40:32 -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 h2-20020a1709062dc200b006a727211d5csi7375969eji.152.2022.03.01.04.40.31; Tue, 01 Mar 2022 04:40:32 -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=LzLLOg+r; 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 EB16A68AF0A; Tue, 1 Mar 2022 14:40:28 +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-bn8nam12olkn2103.outbound.protection.outlook.com [40.92.21.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFEF268A64A for ; Tue, 1 Mar 2022 14:40:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hewrBtcn0BxEfzm+XztZ9pnqPXt229ExIUNlvrM5Pp80mm4cMJMWCrC3cgCXcIIz8NjJBERnLvlEuKBgeECGUB0yQKpquT+PGerhq/BqM/S+RMwB1h8AvOJvjMCrx18/+1CgfdIfOY0lJJu2sFODK6rFxDJ2G0pgZUfLiRUpi1AtB0kWDNRc7Mf4WVvxpzDrRhDSqQvWeEUf1K+ZNGpJDLfwuXQXl4YCExCq4RKJZBFPrGnpjk3gUEWSGlefgTUMX5knMkGWHS0pt5u8w3wJKfDU0d8My6MNdIhFq//rkq2sWi/S2wMDz4Ge3GwyuAuCMjOOq2Jowd38Lftc4nIssA== 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=absUhIlWstGYOaZkmkGkOhWEOEw2BZ7pKUWWLLamz5Q=; b=BRf9GqZS8LSBM+raToLy8RQKCRHiNUGbzPmKVvLWIoKpYzEInANim84VkHWhWSjT/DRDpUg5lo0k2cPLBZ/doRRzmtWPT2rpDjXOi4CLBhwY+LhBlTQTKGQBhMhIPk7OGMikKW3bJvyC7Q0sdMeN56Z657KFq9r9TSI8qFZ0ZUeAVpTDkI4NHmeryaf/jxwKxBfLZMrsoxvgGwTZeJ9KZ+ahpTGT1wFBCTMS6W23E3lddsbBEkvpxJcFjvwV+ypIaZCZ5FUl16+gUX22CeFXlzSNbRjmCJLYrp0dfX5fBDvsb/EOrBXKGRUfktvKQrUDME4f3hdCF8w9790bSsthFQ== 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=absUhIlWstGYOaZkmkGkOhWEOEw2BZ7pKUWWLLamz5Q=; b=LzLLOg+rFEHwkmY/ZUjqUycvEnQ+glpZcUap+FljWBy8mrhC3vjrOMeYpQvhNR23Zli7uGm1ntUKRAd9w1901p+A4ajtFZwJuP0bi3SpoW+YJDhUSvt6Aoy3n6wt4vt+DSsVyDW0RTJXuwWb2W/T8ha0/hobugGeLiugqIl1nXNcRXNv/O8ntnk+l/1sSq0BXkXhsOh1vGZACHf8rmdn4nE20xLEgeizV73wwURpGfbr0RgkLmo4w1Wo7dCw+jNV721F70oxBQHilJCkDqusJGrLqUB6EGLD0Oe7QmCjAe4hlUaMckZN+bFZL7bBW+kn9CXPx6kO9QGwC4FINo9c/A== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by BN6PR17MB1298.namprd17.prod.outlook.com (2603:10b6:404:85::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.25; Tue, 1 Mar 2022 12:40:19 +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:40:19 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: Add unified_time_base option Thread-Index: AQHYLWmCwL+Cm4WR/E+oVtAkVoJGrA== Date: Tue, 1 Mar 2022 12:40:19 +0000 Message-ID: <9DA063EF-2B79-4CBA-9946-3BB1ED4C9B18@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: [85Z/rFuUmET2qEc1ZaLvHSJqO0Ii83+H] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1a0cc276-b7dd-4066-2120-08d9fb80a51c x-ms-traffictypediagnostic: BN6PR17MB1298:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8K8Ve+VI8t5erP0Q1RbZOzPE2Rhq/eBsAk4eFO6+3hrJYzdFVcEeohyJz99uhvLPhTUPTslo1Wzw3LVL3qZO6n/wbOylaCcDR4Vl5WZ2ripP2EtTFZA9gBROEzpFr/fUgOavJ6RSmt79e7YnVocezDbfFdZu0rU2bM33Mj+ldycUzMDgYwvgngGkSjpz03o91JuFP8J0M0BvA+GnuYp382syx00INZeIFSTVXV1wURCs3C07zVJOOFZsCUARcZ/WknfUOZh/k2AIXLjgR4R+39xLwsfxn8UJFloXvpZLs8LOSGyyA8rO+oWDSfU7h6FUvMPI1GJNPCXyoyY8UYk30B3FiROKSEoNU4y+SEug95W8PTDgFnYTWnwJME//x8Mdk5sTWByzQkcr1owV9s8cT/ysxrg+4H8QXVi3Qvn2noKOu/VrB2uNVQRcBfA3jRloJRuIgx8Z89PGDX537abOg61PlIkYAahRXdsfeXfKvzfHuuoO0IkkOwT8AL4qa999KJ0mMVRCHfYEBAQFxtfNBiZS3TRKQ0XQcFuZiZNw8HWz3OFZyHfm2/SSOs4WE1Utg65uxIDrGK5bRJjyDG5acA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: Dm76Gwhz2AlcraBnxjJdNYUySD6VTS1BhXSIwVPrO2+PtLgw8aJbeLreHnSzPscWbdxVjq+o8saZMzQzg2+LETuAfJDR61mbKPYba6jFPh6ofXcHMhUOvDtxj+5icDwt7FPq1y3kDywgrhUgnHOWefs9lUBUDA/RW6dU//sVufhw8ftqX2zNzp5tk8sZEjLjnnsEfduMT2puDhnxzkLQd0OYyUOHM8+ZtPcFzg0ShM0ekH7eBDGc2n3sKqSbcGocGuI0gw3pewKUA4khQtZEVttRGgBAIx3xjIWaAJzk6OVvC2a/AdXPPA7dXT3Ac14WVXo6DN9fspXQMIfuhEptBYRIdNaKk1QX/iXct2gKA9Vq+juQgnfp/bKrgD/9BnwQVEcA6dBwy03INeC2mzZWISfpOrrqhN/1EO4YcSgjS+ctndu6lCzCqB0SFJ/j0Cb/tygJh3mYvVELIF8DXgmUQ7GkRCZ8mUljFeiJpPoStel1Hef87NsW1fVNTJWYMmpz1kvypb1qDmOvwIdz7m739Fune2ITfjxaukaCKo6UEDeCDWlaUkR0h9sxeMfsXxGaYfdyeUnuvCHjW3bfeBx9zTRb2E/NCyEtP4y64D32ltEEyXUHj588XE1YbhAMQPZwG3gm1YprVbFXom3dLlxw6R1zhvmULkcf5QjHTSP1xuz27Fit5gS9bT+XOONDr9J/TVO4u5Hs9YJBO8W29/562TC5rgnK3Ck/dFs2oZ09yz2ObAgrtyhjnIeWrz3Z9bl5rudS/7m4pvJ2LBsrzKKHwT4yQlboIVAlUd0oi/nFAUTKs/Lau6lEPDKh/VQPcwn5DtATopgo+Qt8D2ZAUzOGXlo1w3enJpFTtcb8wiaPkUhobUA+vUfWWeZZAOrT+b7di7yj6tTNC0EsXRIjBnnczuXk3hxdVJFwHGjGm7AK+a3M+PIc2oKRTnd31F1AAz14QdBGe1IM93EUhYHMk8pFgA== 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: 1a0cc276-b7dd-4066-2120-08d9fb80a51c X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 12:40:19.3324 (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: BN6PR17MB1298 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Cm1XQbNn7BK4 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(-) 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) 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;