From patchwork Tue Mar 1 11:26:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Chuan X-Patchwork-Id: 34559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp3582208nkx; Tue, 1 Mar 2022 03:27:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3SteD+hywq4w3Sal73WGObTvp6m1HMEO+xeue+QkC7t7XiQjQxyZLqWERh2VnaWZAdPtv X-Received: by 2002:a17:906:7714:b0:6ba:8a6a:b464 with SMTP id q20-20020a170906771400b006ba8a6ab464mr18678652ejm.613.1646134021362; Tue, 01 Mar 2022 03:27:01 -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 l14-20020a509dce000000b00412809c5f6asi8607713edk.92.2022.03.01.03.27.00; Tue, 01 Mar 2022 03:27:01 -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=tOJxJkXo; 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 3A15468B22F; Tue, 1 Mar 2022 13:26:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2056.outbound.protection.outlook.com [40.92.41.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF9CC68AF3A for ; Tue, 1 Mar 2022 13:26:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cV1Jaly8iGb95RoCeazhsUNTTAHO8jV3a//K/ctw9SYgMjjnwiTiOzhqUI+7iua6VqVL6cJqUhhJYzhp/+9RAkvv4CtpQv9aoRwU0nIPQlw+IfS8Ppo7zbTiXFqTBBpKGu8DdlhjRib4ffNGWMU/mHCJwu6J9H8gG/wQN6i2KENVdFByjhGxRmqaDqPvbK98QfYnJMdD+OrPE2vjb/DELKW/op6/Q7+XtqKXlo7ALmSJQ1q058P4H6Bc/XZf3Xi36GjRNKeEBFvDE4Vw2fTr3kHANVJ2MRc+T+Kunh318hNFwfYu0sm2fJsHHgIm7YHyME2Y9ZC8Rld3f/Bijywa8w== 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=iXmz2ZeJp4FnEvSWzkOybRJhPZGk9Pm7ihtM9ZgDiBI=; b=gCpmEXNJalV0Z4yPq10zBog9IrGu+36Cge7Iahf/Tkfl4D0IaQgZcDljkpo/x4HKYxhsFPnQ0MWfTnP8vJnO5hiMego5gjxP2LlTlvAYQiTH7rfD8v9QHDorKYzCfqp4k9GROYpTiBUPSou3t0RUrTL1GwCETDQM38mDzANE2Zuj7Wo393+ZdugOULjse2nVDYjRHiuHh75f82QllZ39XqDpTccCkyF44bDCxG03J1FwPklYpeYjlxtY/LB5YtSG03orNlulnvy4LggAvBqJqFCPLyRdh65oZLrPpBM0AoynzLA4bbXU/b74U0/mzVrFq7bo8lJeEXez7sTj2gvJyw== 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=iXmz2ZeJp4FnEvSWzkOybRJhPZGk9Pm7ihtM9ZgDiBI=; b=tOJxJkXoQYqiJ08jLhto6lRXI9VGihEvRn3f/5V7EW9RplHN4QxrgV+vxQuVJ9Jl6/f7GnklooYQSya/gA61eWp33voCsvMswcK+kFq8fsfnzLxTGmOODC0cNnkiJzFSNJcFtbrrNym7QN96uEmZCLGV7B4XXCVrlXmH0N8dD/ecf+MhRP1Mz5vMA1OOmCfW+2PjvVRYZcsAcpxIawdFbCufkNi1fE6SwP3ksc7xR7INru8AbyQhzj9HkKd/Jyu0rEC7CIOi7p0J2I7e7Tm/uuZ1qh3UySprLgYMREgNszPZ4CR3fEgmjSIEAluzd2fpv91o4hKWKELx4Z6t6fW/UQ== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by CH2PR17MB3544.namprd17.prod.outlook.com (2603:10b6:610:3f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.24; Tue, 1 Mar 2022 11:26:49 +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:26:48 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: add unified_time_base opt Thread-Index: AQHYLV89l13F7Bf0WUiUJKTV+yP5hQ== Date: Tue, 1 Mar 2022 11:26:48 +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: [7dBMhiecp5xC63M+3bGGke2zo3OJ7hDj] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e9e10bc2-3998-4b03-904d-08d9fb766048 x-ms-traffictypediagnostic: CH2PR17MB3544:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9A9EiONtRIqIuCDw8xg/JihRRxAh+GGuy0RSiYkZKfGucXL2G691EZ5KhcpnHsq4wRV+0ziqjf8c+6hynNnukKzuUUDezCEl8cVYv3+W45J+ldYhJSvI9spyhj0qQk9MRbvoD+1V+/fe94U+Xo6Q82c6OrbsCpUHpsIkiSQfOw1ePzpPt5NP5HLgOXUisiBJpQOEhaiycSMecBKLdNqif5cZm76NQsDShJopuaP94BDqeuGyBN72M3WpGp5ZqqjeNlS5jSgZ5Li1CYxtlQf87m+JpP+bPCBL0wy8iTrW5odLzDI2m03yTuYFDNUJ7DDUpy5zKmvztsijcpxJ2zpZ197+kkvCitTHfeDTvwy0HDcvsJjnu8bpLshm9xS0Cx+yqIyyGhuzVdBruBWw+DqQlJ+yfICdbe03PUqYCuEg/g+rWL5t67q7YbgPgC/r2un7AQTgxbEIp0HL6IBJWHu3ztxbca7gLB62RYKLY8sSBDwL4EBY8AN+PIr3oUwEU1IMKc6s8qmvzsq9pwEnDMHwzhcBUhc1ueACEWWUiWu8vKIgGPlnKTW3QlwhfesGocXbWL2EoXuZbpe+WfYTR6Dwtg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: pQhNYbu5bFrOQfCktDERHXYpx1nChDOTKy0oKcMQcsdiAyy/IHHFsiaBb++otVqqRRoS8PoZITfH4gqi9AWGnlC6OzGAvevk6M3+L4tuU2bwNUOWiMrNOhnASLWGg2SyRy8hS1nSVlBR18Pn3sJFyI4XttJfRtuwV4cdHuGYBPNbKQqvCjjMZ/KtJTRCFRSAl1JcdADVqkFMRxHCZG7Ny+VMINl93hcCFtr6uGB+9derrs+2ErHOxit0ElpXe0Prkh2PbYitqzKlwCJ1hxloGRA0ugcw9brANw1F8hCXxezL/jRA87TqjeZq3T9GT3JVXQ98dB9CQmUQ0Un38gsQ9ra+KTPXgQ+Hi2roExJxCbMcprwgh6Ui5IfTCu1J6OMsiVcIn0mWhWPEoL4Bh9YrTXzjRaD2u1eqj5yi41bZ637qKkiPBFfVJ2rDwErWbia40qoWn0r1gtcn9W66YihdC0Xe6RTiqPizzkkTzYo3Ea29FTz0XC46fg+XSiVzTIGZeUaukleySvnRpQlJcU5ceCqKGz4Sd1TFAoZ1typjKYbHn8gJBBJ3MbODSTdYEd2qVXqlVqBTcZPXWQ4L8yFgF9qpxIWiq9Le2IeMxKJrIwawl/OgCo+hLxmo/Hi2AzRuh2+3T3bmSqkJrFW9wdjhwBnir5YfoxZVYWvltCbIRZYzNth1szfDdbt/eJqj0n6N8yAzagdZOOFrbcXCXbPC59c0yUoLn7HFZ3s9E3DqPpN2uSXm0M99QKxm5XCmsfMIYA+I7QNreNoezS+T4MRjhyqmcFLeK+ePOlLNRsRmCVY3Smm89e3MeofkEeYEybQukvbFzw0EENlAGAtnMqVgEbOBBBrFgenV51AH+HaubH2azkl12oPJFk3tkm7x+7q2heqdvnPA2HNuWKK1FeMmEQDyj8watDAmQ25QoiefkyiMbwJpdZkxCK74QC/PNn6wjxCxHPMKVWVnB4Qj9ycHCw== Content-ID: <9288C4126F85A847ABC828509F1C8B98@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: e9e10bc2-3998-4b03-904d-08d9fb766048 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 11:26:48.8779 (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: CH2PR17MB3544 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: ioOO7PpGJnY3 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 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 } };