From patchwork Wed Aug 10 16:25:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37218 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1012775pzi; Wed, 10 Aug 2022 09:27:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR4prVrFF9/OdNsp1ziThqC7oap6SEiuzyr4tczCAHqAEQDgB/jlepZU1wd06gyRDc0KTSQq X-Received: by 2002:a17:907:2895:b0:730:9711:ad60 with SMTP id em21-20020a170907289500b007309711ad60mr20736523ejc.159.1660148847298; Wed, 10 Aug 2022 09:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660148847; cv=none; d=google.com; s=arc-20160816; b=0K5xaAw427XRr0zar3t6GmlArwiiS8jMv5q+Ft8u6d6XhhuIKT0lUGkZ5+lvY+0JZW 34mZPwl4P67dchab/PErmSuFWEVeQMJVLRAhAlpjQ37Rv0bx1t45oOJFy22FVCSEMg4j 5MxC55N9hT7meYVqcR9pegCQ+AJ5gaxU84oez1gi6YZomsZMSZ8jwO5VEpdazIuG5RU4 BBdX8v0bJKnNMqNU+DXU2V5N38Rge85e3XPCv7+l34UC+iNRCkDuVLS79ps2n+BwdUAh GlGO564WTdJr1fNF2FaVEGIlM+yOG7cuCu9zVE7EkuoE7tV9Kbn+/iggttiNSi9XferI Qphw== 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=5nk7QdiIpqCKJbMD9EC86IR5QXpphtBf257TC4C21OY=; b=ANZ4OAzcfatBN43ABS0Pfu/9zE8cwLrd7En9Dd5DFSG3UWU5GEcgFeiM8MTylGXbYR b1K9ebfPGCJ0M0O0Z9lvDoXt3huxJX34+7JvRRaHFCO/lRgPCBRRF8Zm+/vFYuSFbdO0 ZprbG1np1IGyTRFJfvXRjXNyk/AMQQro2012Vdc1oFD84l/wD3JdltUFVKEh2hVaVXZ+ AOd2v3DTZDzi5fY9l04jMmY1Nf+rFaPR60aRSUGzirKtKvLB8clgHDG1j90duZWk/WEu q/LxME2trDudFUe8YMJj7/Ps4643Hm6yAjf/hfcAO2Ndy5uOLXlH0yJ+Rj8/MJ65QdYO 8q2A== 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 hp14-20020a1709073e0e00b0072a4a97a5casi5545450ejc.172.2022.08.10.09.27.26; Wed, 10 Aug 2022 09:27:27 -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 7B6F368B8E0; Wed, 10 Aug 2022 19:26:13 +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 0183968B8A2 for ; Wed, 10 Aug 2022 19:26:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 5322C240507 for ; Wed, 10 Aug 2022 18:26:00 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id BPpu5atjXEPj for ; Wed, 10 Aug 2022 18:25:59 +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 535B124050B for ; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 45B913A0451; Wed, 10 Aug 2022 18:25:57 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 18:25:43 +0200 Message-Id: <20220810162545.21382-7-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 7/9] fftools/ffmpeg: simplify conditions in 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: qMm/5NDB/69K --- fftools/ffmpeg.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index cacbde27db..dd45cb4516 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3713,8 +3713,7 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, if (ist->next_dts != AV_NOPTS_VALUE && !disable_discontinuity_correction) { int64_t delta = pkt_dts - ist->next_dts; if (fmt_is_discont) { - if (delta < -1LL*dts_delta_threshold*AV_TIME_BASE || - delta > 1LL*dts_delta_threshold*AV_TIME_BASE || + if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + AV_TIME_BASE/10 < FFMAX(ist->pts, ist->dts)) { ifile->ts_offset -= delta; av_log(NULL, AV_LOG_DEBUG, @@ -3728,16 +3727,14 @@ static void ts_discontinuity_process(InputFile *ifile, InputStream *ist, pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, ist->st->time_base); } } else { - if (delta < -1LL*dts_error_threshold*AV_TIME_BASE || - delta > 1LL*dts_error_threshold*AV_TIME_BASE) { + if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { av_log(NULL, AV_LOG_WARNING, "DTS %"PRId64", next:%"PRId64" st:%d invalid dropping\n", pkt->dts, ist->next_dts, pkt->stream_index); pkt->dts = AV_NOPTS_VALUE; } if (pkt->pts != AV_NOPTS_VALUE){ int64_t pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q); delta = pkt_pts - ist->next_dts; - if (delta < -1LL*dts_error_threshold*AV_TIME_BASE || - delta > 1LL*dts_error_threshold*AV_TIME_BASE) { + if (FFABS(delta) > 1LL * dts_error_threshold * AV_TIME_BASE) { av_log(NULL, AV_LOG_WARNING, "PTS %"PRId64", next:%"PRId64" invalid dropping st:%d\n", pkt->pts, ist->next_dts, pkt->stream_index); pkt->pts = AV_NOPTS_VALUE; } @@ -3746,8 +3743,7 @@ 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) { + if (FFABS(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",