From patchwork Thu Dec 14 19:31:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45138 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5185707pzf; Thu, 14 Dec 2023 11:33:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0Ppwsh/ISs4Rw4qYX5A7ZmqJ/iEvawGFlBmSnP3DSxaZf3DDxmUryOekTleHj3NbE8r55 X-Received: by 2002:a50:c90d:0:b0:552:1317:20cf with SMTP id o13-20020a50c90d000000b00552131720cfmr1546693edh.60.1702582389926; Thu, 14 Dec 2023 11:33:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702582389; cv=none; d=google.com; s=arc-20160816; b=hIyg5yd1PSXfg3vPD2m/uDwFKJMi2WFl+hfDL5WAl4dXgpl09mtxqbPOU/EzgiWGSs wOc3exOmhvS0ccNUcKoTZPH9w4PdoUUz3moGbNJfuQbIhEiDFDZf2zHBLl40EQjyOJLv nD0gzse5cfFOWOF4CZ0jHWbntBtksIBJ4936pJyX40aKDdzx9AaRlY5P130FTpADFXgw 0awxDcXtqVyUwMYHOExN1klaHxM3OxrTu6yIA+nB9aeuSTgmm7ep30oTv8vaW0602Gx7 5f09UC452xFLfFzg4xlzWrBZ4aIBSkACrfsHaZiqqvXblKtlisySst3GGYz2OwmGWGMT q8FA== 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:message-id:date:to:from :delivered-to; bh=a0lLcQpaXX++qgpwaVEp6zkGCJ0y3NZLVOyv40OlrTI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=jDDIDXdxGpJqI5UhUZwZdAdNGjQwubEXhsB/2UPrKe6/Ysx/3qSzCnfivGGIwnL1w5 ljnvu4NPPtylac3CNSthnmtvtQd42Yj78IrFvyHu22yyJuqATsMxPxn71MRPqpYuE5Uv E4BbH6iSwAXgBz95XyWWixo+LczoZkEj9W8GIPQcS/9U6nfJfKQTavKsGmup91oOtMaZ z2jayiUafpClNbhlpFD6jZxE9RSZTtyrEITVJ1zheJsHIepfHdG88eMf0tCcW6tsg/24 cmLOv4fNHzAxDg7RMWgRf8f0kLYJpjMhZgHwGjcnC/mHt4APgMNvGKzfH5ONdMEGdPCX FB7g== 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 c10-20020a50f60a000000b005525b851e2esi1165760edn.75.2023.12.14.11.33.08; Thu, 14 Dec 2023 11:33:09 -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; 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 6468668D293; Thu, 14 Dec 2023 21:32:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2587C68D25E for ; Thu, 14 Dec 2023 21:32:40 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id CB0DF1BA2 for ; Thu, 14 Dec 2023 20:32:39 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id xMo1mVIuKLbu for ; Thu, 14 Dec 2023 20:32:39 +0100 (CET) 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 mail1.khirnov.net (Postfix) with ESMTPS id 5E2C71783 for ; Thu, 14 Dec 2023 20:32:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 466D53A0336 for ; Thu, 14 Dec 2023 20:32:31 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Dec 2023 20:31:30 +0100 Message-ID: <20231214193138.2503-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] fftools/ffmpeg_mux: stop logging to AVFormatContext 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: vnmIDLQj6xPA Only the muxer itself is supposed to do that. Log to OutputStream instead. Drop now-redundant information from the logged string. --- fftools/ffmpeg_mux.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 8e523dd49d..74df6dcb64 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -176,9 +176,8 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) if (pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->dts > pkt->pts) { - av_log(s, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64" in output stream %d:%d, replacing by guess\n", - pkt->dts, pkt->pts, - mux->of.index, ost->st->index); + av_log(ost, AV_LOG_WARNING, "Invalid DTS: %"PRId64" PTS: %"PRId64", replacing by guess\n", + pkt->dts, pkt->pts); pkt->pts = pkt->dts = pkt->pts + pkt->dts + ms->last_mux_dts + 1 - FFMIN3(pkt->pts, pkt->dts, ms->last_mux_dts + 1) @@ -192,15 +191,15 @@ static int write_packet(Muxer *mux, OutputStream *ost, AVPacket *pkt) int loglevel = max - pkt->dts > 2 || ost->type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; if (exit_on_error) loglevel = AV_LOG_ERROR; - av_log(s, loglevel, "Non-monotonic DTS in output stream " - "%d:%d; previous: %"PRId64", current: %"PRId64"; ", - mux->of.index, ost->st->index, ms->last_mux_dts, pkt->dts); + av_log(ost, loglevel, "Non-monotonic DTS; " + "previous: %"PRId64", current: %"PRId64"; ", + ms->last_mux_dts, pkt->dts); if (exit_on_error) { ret = AVERROR(EINVAL); goto fail; } - av_log(s, loglevel, "changing to %"PRId64". This may result " + av_log(ost, loglevel, "changing to %"PRId64". This may result " "in incorrect timestamps in the output file.\n", max); if (pkt->pts >= pkt->dts)