From patchwork Sat Mar 25 19:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp225852pzh; Sat, 25 Mar 2023 12:17:26 -0700 (PDT) X-Google-Smtp-Source: AKy350YXLOfp9SV21jye/uEN3BFwq8w+KWZxc/Oq7Nfp3ACwazqmTN5V+gpZLtxDPO24IqXsvM75 X-Received: by 2002:a05:6402:48e:b0:4ff:844a:ed4c with SMTP id k14-20020a056402048e00b004ff844aed4cmr7188285edv.0.1679771846003; Sat, 25 Mar 2023 12:17:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679771845; cv=none; d=google.com; s=arc-20160816; b=rD41BlwU9J/47LoUn70a3u6vVR1J0LPxZgmpuoA6oM0wPx7Mx7PK6hH8x1SZ2Fj17x sQk+Z4bcX/GPOe8YV/VnWZ/LS5Pvsp2HaRfd64KnnC+/+ZCfxVtgxOsl8kZaC+1qZ+U/ kPiidsY3+99pj04wM/LcsODWZOnAHTtAOxTiH0rGATV425qniN8CfUdOd2Z30QSOlJL+ yeA+jrLi79shjUClZMDtWcX5APVLBccY/ByuZst3hOzWKpN/ozX58L8vKoqekvmXVU7D ERpebeAOeB3LdpKgQIcMVfljhfr9aSOozC6eXEvUyjGpg5voQuNBHZ7bDwoEcX6yiZZB dUmg== 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=yqbZl/qIegs8jquuo4oBgpdNfd3bQZKKcAtCGhG4R1k=; b=j18UEZV+fwulA/4MslLF2XHEsHxHJzTROQJntQeN3uQLUh1Xr+JEIn0fJgczxVAwsp y2vsLjyMtasOCVnqNwf5UvXq9Y4pIArMy44M21CStNhnj3pm4sDo9C15sls0X7rtYDYY 4aWeKsgF9FvJpfuURW2ZclYjJ0Ch3HW30tq8tT9WgMBVostJD/8610ZWl2eDNXRSgaD+ bLZ+1I7KVW9KcldhopkqoHav3mLLCf4dLTujDNVtbM4vm94fnknXXtrttdzGR0GJOaV6 zU3E82gRSNPuOtogk43o2L8f9UXSG/qHQZsQC8k2XGqbdevfqdEFdwV2DvOelHg5IOJ2 a1cg== 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 bv18-20020a170906b1d200b0092971a9d5e6si21438447ejb.966.2023.03.25.12.17.25; Sat, 25 Mar 2023 12:17:25 -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 98CE168C9E8; Sat, 25 Mar 2023 21:16:17 +0200 (EET) 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 72EFE68BEC9 for ; Sat, 25 Mar 2023 21:16:09 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3E2D9240178 for ; Sat, 25 Mar 2023 20:16:09 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vArgWvyNlZuv for ; Sat, 25 Mar 2023 20:16:08 +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 mail0.khirnov.net (Postfix) with ESMTPS id 44DC0240D0E for ; Sat, 25 Mar 2023 20:16:01 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 11E1F3A06FD for ; Sat, 25 Mar 2023 20:15:55 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Mar 2023 20:15:22 +0100 Message-Id: <20230325191529.10578-16-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230325191529.10578-1-anton@khirnov.net> References: <20230325191529.10578-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/23] fftools/ffmpeg: replace ff_dlog() with av_log() 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: uBOIhL5apZa9 ff_dlog() is a lavu internal macro, and av_log() at trace level is just as good here. --- fftools/ffmpeg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1969ce9295..0324e45afa 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -49,7 +49,6 @@ #include "libavutil/samplefmt.h" #include "libavutil/fifo.h" #include "libavutil/hwcontext.h" -#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "libavutil/display.h" @@ -1202,13 +1201,14 @@ static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf, kf->expr_const_values[FKF_T] = pts_time; res = av_expr_eval(kf->pexpr, kf->expr_const_values, NULL); - ff_dlog(NULL, "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n", - kf->expr_const_values[FKF_N], - kf->expr_const_values[FKF_N_FORCED], - kf->expr_const_values[FKF_PREV_FORCED_N], - kf->expr_const_values[FKF_T], - kf->expr_const_values[FKF_PREV_FORCED_T], - res); + av_log(logctx, AV_LOG_TRACE, + "force_key_frame: n:%f n_forced:%f prev_forced_n:%f t:%f prev_forced_t:%f -> res:%f\n", + kf->expr_const_values[FKF_N], + kf->expr_const_values[FKF_N_FORCED], + kf->expr_const_values[FKF_PREV_FORCED_N], + kf->expr_const_values[FKF_T], + kf->expr_const_values[FKF_PREV_FORCED_T], + res); kf->expr_const_values[FKF_N] += 1;