From patchwork Wed Aug 10 16:25:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1012262pzi; Wed, 10 Aug 2022 09:26:33 -0700 (PDT) X-Google-Smtp-Source: AA6agR641M2TXaPmVLroM7QeeT028hdY9XuavF11TP/5tWy3fhMr1NutPo1YvKLHALUHzDqstU4r X-Received: by 2002:a05:6402:428c:b0:440:8259:7a2b with SMTP id g12-20020a056402428c00b0044082597a2bmr16332149edc.329.1660148793318; Wed, 10 Aug 2022 09:26:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660148793; cv=none; d=google.com; s=arc-20160816; b=OpH7NXQFXir9iRX7bUkzOmubLUAxpbm00tyb0SCsUM4ZkpHvehr7sbD2WDGO8zyPHf C8h0276LcrM7fJJV/CjHPSoXSlKncpY33+/oxATBCz7euxgTqsTY6kpDiIPREzrFrtEg UPCv7ROTFZof2iiIQ5yiJkRaHlUN0idQOYiJvaz4PmST3DBr04eAe3KkbDMAc1ECJLV4 XW5aaol2/oX6YOvVZBBdU3nH8j2vhiS3a6TASbeo77fN9sjcik+8GaDGYv1Em/1es3Bg t12MFX+WAKzSD4EW+Gna6VWJogxD/IENZ5xfwxG34DgpFl0wSSB30uCPymTDrherAgfw Q7ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=WYFpheDaP335j2cGSjvXNrHsULWwVv1pZ3KmUAhXGiM=; b=AjCtMoS6GPwIFUBI23zaIkMrBBNy3vhY+DVh5U74GCHuq/zYicsj0Hpq20mY3V0Oag eM+VnG1FIzGikjV1PWCtkZMk6YgBTTiCk6+3UOsjfHVfB/Yj/3W3+okIDttWrVNjnuDt 8Wcf7z7jUwrPrci/pcuBvK12DzlKnAgQcBK0FJZ44J+eF10xONA6AmR5VtEcwnOxmFst 2AAVAkBo6pVFC+/YiOd92x4wxSYq67oxbNH7wHnE2qAIwS0/NwP2dnkiCxt+jmDGkqGg Cnf28nyQyTJI347s6w1mwzFFWK4GnXUAHhp/6dg2aatWrZs8OAkN+Bq59/j12buDXxpo qxyg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hw9-20020a170907a0c900b0073318653cb0si1069741ejc.759.2022.08.10.09.26.09; Wed, 10 Aug 2022 09:26:33 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15AFA68B64C; Wed, 10 Aug 2022 19:26:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B39D668B371 for ; Wed, 10 Aug 2022 19:25:58 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 36A8A2400F5 for ; Wed, 10 Aug 2022 18:25:58 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id bRhn7iTLMfWL for ; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 33C2E2404AF for ; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4142F3A0449; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 18:25:42 +0200 Message-Id: <20220810162545.21382-6-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810162545.21382-1-anton@khirnov.net> References: <20220810162545.21382-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] fftools/ffmpeg: move inter-stream ts discontinuity handling to ts_discontinuity_process() 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: Dq4mnSZYp7IF --- fftools/ffmpeg.c | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0332528d57..cacbde27db 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3743,7 +3743,22 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, } } } + } else if (ist->next_dts == AV_NOPTS_VALUE && !copy_ts && + fmt_is_discont && ifile->last_ts != AV_NOPTS_VALUE) { + int64_t delta = pkt_dts - ifile->last_ts; + if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE || + delta > 1LL*dts_delta_threshold*AV_TIME_BASE) { + ifile->ts_offset -= delta; + av_log(NULL, AV_LOG_DEBUG, + "Inter stream timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", + delta, ifile->ts_offset); + pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); + if (pkt->pts != AV_NOPTS_VALUE) + pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); + } } + + ifile->last_ts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); } /* @@ -3761,7 +3776,6 @@ static int process_input(int file_index) AVPacket *pkt; int ret, i, j; int64_t duration; - int64_t pkt_dts; is = ifile->ctx; ret = ifile_get_packet(ifile, &pkt); @@ -3877,24 +3891,6 @@ static int process_input(int file_index) if (pkt->dts != AV_NOPTS_VALUE) pkt->dts *= ist->ts_scale; - pkt_dts = av_rescale_q_rnd(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q, AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX); - if ((ist->st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO || - ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) && - pkt_dts != AV_NOPTS_VALUE && ist->next_dts == AV_NOPTS_VALUE && !copy_ts - && (is->iformat->flags & AVFMT_TS_DISCONT) && ifile->last_ts != AV_NOPTS_VALUE) { - int64_t delta = pkt_dts - ifile->last_ts; - if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE || - delta > 1LL*dts_delta_threshold*AV_TIME_BASE){ - ifile->ts_offset -= delta; - av_log(NULL, AV_LOG_DEBUG, - "Inter stream timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", - delta, ifile->ts_offset); - pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); - if (pkt->pts != AV_NOPTS_VALUE) - pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); - } - } - duration = av_rescale_q(ifile->duration, ifile->time_base, ist->st->time_base); if (pkt->pts != AV_NOPTS_VALUE) { pkt->pts += duration; @@ -3911,9 +3907,6 @@ static int process_input(int file_index) pkt->dts != AV_NOPTS_VALUE) ts_discontinuity_process(ifile, ist, pkt); - if (pkt->dts != AV_NOPTS_VALUE) - ifile->last_ts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - if (debug_ts) { av_log(NULL, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n", ifile->ist_index + pkt->stream_index,