From patchwork Tue May 23 13:58:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp601891pzb; Tue, 23 May 2023 07:01:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6brM8XXRl8U3Cn6Ws0I56K6CBi0b0ykcMZoZUnHK2UOLRvAchFIT0CADxgU9wFsp2Wgkri X-Received: by 2002:aa7:d74b:0:b0:50b:cc52:3fd3 with SMTP id a11-20020aa7d74b000000b0050bcc523fd3mr11008708eds.41.1684850478689; Tue, 23 May 2023 07:01:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684850478; cv=none; d=google.com; s=arc-20160816; b=vLGkslE20V5JkYLZ3bBEkkoQFsIoBUYgYj/XYWhctfGu2ugXQV+ekQP/hN/SvqXCX+ /jsQf3PRPC95Gt8HhgvoD0dOe3twW+eigww4rlSuZMohyyjJM1UWTLwUa0s9i8nesU/H XW8aXbpWM6h41UGiPV7W2dFee2Y9BJerTywHQInMqXx+ioZPfuuD9Qb/8OAlV0KNpU8u P1I/RC4JeTjdCBSpY5JIg3lJM8hym1Y1R3XUvEXac0jM1uiTAmyXzw5B4bosqNcqfM0S Q/vTBoA9aDmGJzOva8jy6sXMib39/LZTm8RPmWVVPfK6cg0tSHveIKkVoozOlrA9YrnL uJmw== 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=tNpXxMB6ScC7hDen8GjB5OCcVi2zCFgBiKjEv0p2edE=; b=lziLNwu33GmMj2NdQXRG7pxVK6JixvTgsyCydp/TkucN0UhITxRTIc/VcWRUB8hv4r 2H8ErKUxPN9wp2PDiu0jbD6YdZA9B0ul4Iup+6jKSXfTgBWrEi0eg5a2Pg0rhJn6xzrB unuZhhICxIw3xlXwqaf3EfOQCTB0m3AooKAIsubpjR7gkYAu3hxgvMY89RZk67Vr12Cn 0ZOFB/dPcC0+fElSuFxdWiSY54ZmRHX5u34PFrri6jmZtfZEU+OUFIvTPPOfATW5/Mi+ 9VaArdSpU22V8wggC0PJWjSU6I19ksKxVAbPqH76Y+k5ZIxSSblc569KULRzxrr5OyC/ 9rNA== 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 n13-20020a05640206cd00b0050bdd834874si5687528edy.108.2023.05.23.07.01.17; Tue, 23 May 2023 07:01:18 -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 9901668C162; Tue, 23 May 2023 16:59:16 +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 8157468C11A for ; Tue, 23 May 2023 16:59:03 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2C9E22406CB for ; Tue, 23 May 2023 15:59:01 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id AyH_YpN2Z6jG for ; Tue, 23 May 2023 15:59:00 +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 B63032406CD for ; Tue, 23 May 2023 15:58:48 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A7F843A031B for ; Tue, 23 May 2023 15:58:48 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 May 2023 15:58:40 +0200 Message-Id: <20230523135842.20388-13-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230523135842.20388-1-anton@khirnov.net> References: <20230523135842.20388-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/15] fftools/ffmpeg_demux: log discontinuity warnings to stream context 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: 1m039DelB9gG Allows simplifying the log message. --- fftools/ffmpeg_demux.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 828a1182f0..561b4b0002 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -248,12 +248,10 @@ static void ts_discontinuity_detect(Demuxer *d, InputStream *ist, if (FFABS(delta) > 1LL * dts_delta_threshold * AV_TIME_BASE || pkt_dts + AV_TIME_BASE/10 < ds->dts) { d->ts_offset_discont -= delta; - av_log(NULL, AV_LOG_WARNING, - "timestamp discontinuity for stream #%d:%d " - "(id=%d, type=%s): %"PRId64", new offset= %"PRId64"\n", - ist->file_index, ist->st->index, ist->st->id, - av_get_media_type_string(ist->par->codec_type), - delta, d->ts_offset_discont); + av_log(ist, AV_LOG_WARNING, + "timestamp discontinuity " + "(stream id=%d): %"PRId64", new offset= %"PRId64"\n", + ist->st->id, delta, d->ts_offset_discont); pkt->dts -= av_rescale_q(delta, AV_TIME_BASE_Q, pkt->time_base); if (pkt->pts != AV_NOPTS_VALUE) pkt->pts -= av_rescale_q(delta, AV_TIME_BASE_Q, pkt->time_base);