From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1C8744224C for ; Tue, 1 Mar 2022 11:17:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 00EDE68B133; Tue, 1 Mar 2022 13:17:19 +0200 (EET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12olkn2105.outbound.protection.outlook.com [40.92.23.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A69668AFE1 for ; Tue, 1 Mar 2022 13:17:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=efzB2Y+wEJNreAkFd3MpmrA5dY86a3jo2dtVNA+0rY8S2/SvbE4gL+wE9s2GJD9UpujT8Ix9o2U1hcSAA9yYPvOChmfy/gL91tk3uXNdh9ZbPaxmQwybSCIsWGE2YoSnTmeVhnh4sNUKP9bg//O12VTZYkOpiwODTopcOELuH/m3LkctcialujUsoDy5oJ9ptKCXnDgXLVtjmD9J0MmhCR6IVY+DhHTV0K9iJxxXqRBbS7mYx7Yjop9WQGB1/cbKzhQHp/eG8V9bwdaSumz4RBmelNmNLdSbwa1R/Jmg6cLKSxs1uTHOT/mmv+pR51j6Ddfx+dE/HzgOFU+C8p/2jA== 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=KlPwqbUVQ/1xW4JTf5GdBuui71Df7xryi89Uny0qRMEOQ5DoIRCqaWLo0VAQ83s1QPep5ns8cTTwU2Qqzk/FYivap50QneyioJTa5qtGN3BAAE/CyFPX5Y7tC3n93Ot+Wo0TMOmpeSKQofE+5VSOa8YuefDwcwBFfgnXBEE/HXQZyLCcjH9IfZYfQdD7vXpbnRftJ3x/hJGaJ/fQ/v5siqLXOWeQ12uiOpaFrQRDHZ2yKN3hbPbiJMspJKJhv39xdKE9U7CM6QwtykKsOY+J4wQwP0P9prxS6PdeJVG6c8brQS4lEOZtn4ykpvPUtbOo5RVB2kROR/UYk9vEgyyiTw== 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=HTaC5sLw3vQEUcoM2BeKm5Ebb31qC5NXfrY4BJmL4PNhfgsOAqBz0DNvbBU1tgMhX3mMzv1BFlVvWPH/0hapjXmMqeBkRBaqc/BtM25HrBYvuASE0vlBZ1NDhbKnc7EUVf1uDgeHkUcG6geLQIUTVfBfJo1FNJJ99I9Cebou2yLVDfFXfbBUZ6O2Q9abWTOgilEoGI6c1AcxOhXpEs44rFHyGcE4klTdmIozcx7sHy4qO5W6Fcy1UIH9gnBGpcX7WZfboIbjps8DiUs6Y+xJdRoFZY5C5LKAWzqzmgEtg7/zqSFJPaOPOqZ+B0Yieg3wjvhg/cO8gWnoTFwQlwYpEA== Received: from SA1PR17MB5122.namprd17.prod.outlook.com (2603:10b6:806:1b5::9) by DM5PR17MB1641.namprd17.prod.outlook.com (2603:10b6:3:14c::9) 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 11:17:05 +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:17:05 +0000 From: Ye Chuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/concatdev.c: add unified_time_base opt Thread-Index: AQHYLV3hq9pD9qiz+ECq7YMW48z6bg== Date: Tue, 1 Mar 2022 11:17:05 +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: [vZmRweArmpJ1+glRhqXzPDQNFZMoaXn4] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e7617010-dabe-4fdc-556c-08d9fb750460 x-ms-traffictypediagnostic: DM5PR17MB1641:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: j6Cqv0Tm/Mrm4FiGQASuhf8tCLScFRQsCLRpcApBopkJYs620sYvxadOnxpcCuIT4zCxrWB6ajawRtUFh/TspwSZY1FhVXbugYU5hliypTW1bfO9I3SjryFA3dnhh5Ouo7kfcvy19g40q40f5Oy7TEcHACQdjHcQo3ZVpDr6Ifg4eAnQvHuXV0TVPG2n/EyzbEB0U591SYPcS3OG0XpxUKxpm5OcXlPNGdlKuP/q0FtDQtNBveWdMny6oISxX+oi9IIIFT+4aBA2GZP2doiVeeVWOt08dhXKwlq0XZXl/DmwvYL38Ga8Z4tYXqL6HEAVV4sXGpOzQ5jOjdg23DO0LenHMvddLf23dsF1Xu5E88BMkRsJVHdGKJ5vgyppuMvKU0iSeS4q/pNY2lXb7niSwc52YNuv4IYNsXbgpqXvmTdK6gB7iJZQW6Kv5iBIpKiDy/dHcMCRlr6pr99KLEFqwTgJgiFA5vlLLLXJ4HQkj69Bvg0nC7XweJPv7sQ/yGDWV8agkS3Mg8kS6e/32JlQ8BCwFTH9xNQ1n+P0AOI3V1FOLI6LtDySH6K22ksSy4udBt+0lK3vaT3acWT525WOKQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?nvQbrBVoelMRxQO8YpxJ8SvOyVzOt82AGHou6vyE9dKabk8VKii9BL4Q3Oid?= =?us-ascii?Q?/smkXLFP9vXtFDRuOkI7T5GUCYhJSsl7N4Ouc/M/aT6Pvkq6ZVNz5ElM3Iga?= =?us-ascii?Q?RcYdQgImUSQCYlKu6gaTiErMv9+7wNnxWbpsPKPcC831pD56uziD1/gzD2kI?= =?us-ascii?Q?+1o81ocsbhzFv3+dCaQmWtDJ5Yv3qFptuzQBR1aMjsNmHRSaCGB7SESjR7AF?= =?us-ascii?Q?knomM2jzLchBAngSZvn8N+AXBN464+x3WgGmL6frCLfGQTKtzm2xCNm+c7UW?= =?us-ascii?Q?SfJ7TSgJSt9fMFz6F9S10D1OWsFZU7UBtSqMKGWLZJsxWzITyRAoesinPFPb?= =?us-ascii?Q?GyjbzA3YfcQOz5tEvelF9WbH5QT3hXAA0nwfVz5Zpnxr5LkDZtATv1RXH1mY?= =?us-ascii?Q?X/f4hk4xlalPUZYFJeOB3dW79STDLCX6t52ivgeil1ugymu94UiS/wTDqvyr?= =?us-ascii?Q?sNoxqobl2mwY2J3MDpEBsWVTI7SC2QDsD6H8kxDBk7CPIl72mAkf+Y81gNaX?= =?us-ascii?Q?7/u+BYSCi9qkhxvRBvtAjb9dX40SaH91ZDVlGWH5AouHk/jrGLAyZJ5kBJ2V?= =?us-ascii?Q?cr6HOOg9Ue/s1g+CAP865x+RzERqurvWlL/+3nuO5yIfX3Rry7QcFqllYpGY?= =?us-ascii?Q?YgHVPW4YySgOMRGYIJcP47tMDc2byj7wamwRhPyX7etPg9P0peyjoYLgz//r?= =?us-ascii?Q?sr+qvv/1ETiKGlzVOGJTQcQjsSSIrGOI+8dClXaDA/MOlLnZJ+iidbOGvy1j?= =?us-ascii?Q?/yU0QorB09WRFLKy/yw7ZTd0EREHzIwOmAzJb4q9GwsZfVJDJKK+aOJlJ907?= =?us-ascii?Q?DcWQ1YxgxWggVY8jBKCdC1Te1YKn9zBVwCawP57C2aPU88CXMWLQH7/xStuE?= =?us-ascii?Q?/6k2+/djytg8OR33EnZ7X3xCNPDtjZJUFYvzAdv54PDc+v7Y1xOu/LF4BUIy?= =?us-ascii?Q?Ej9Lh+vJ1d+ReoxgWLaDbg=3D=3D?= Content-ID: <7F54E8215D9A714A85EE2507E7CF66EF@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: e7617010-dabe-4fdc-556c-08d9fb750460 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2022 11:17:05.2244 (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: DM5PR17MB1641 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 } }; -- 2.30.1 (Apple Git-130) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".