From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 3430D4D385
for <ffmpegdev@gitmailbox.com>; Thu, 17 Apr 2025 16:42:27 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D74E6687C7C;
Thu, 17 Apr 2025 19:42:22 +0300 (EEST)
Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com
[209.85.214.171])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0012D687C77
for <ffmpeg-devel@ffmpeg.org>; Thu, 17 Apr 2025 19:42:15 +0300 (EEST)
Received: by mail-pl1-f171.google.com with SMTP id
d9443c01a7336-224191d92e4so12885365ad.3
for <ffmpeg-devel@ffmpeg.org>; Thu, 17 Apr 2025 09:42:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744908133; x=1745512933; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=qUKrGIwzX2O6YLsT3blUzRYDgAFe25AKgx7YksHnwEE=;
b=iOFsmHR6X/tUJL6M6yW1aCutg/1lOt8ksD3edhgIasF+peYpn8VOyuCkqEvL6+nnjA
tJKRmmScFN3IKG+bdUG0zgSt2k7W1TfoSfdErzJCY/U5Cgr+Xzae16SB7RsuNPmDtluD
gsVohms8Lx05C/+bPPo2UasDFu/sQZTxiYl3LCkUH3aoLtRVddDtP6emgvJegx+TBd6F
SvL73INuQ4e8JOKwSLAQ4mOen/03fT5WoX3A+h5OigFTNJP9fzgpNre3dmR7QSpzNzQ4
MqMpMvvK6iWY0VvU7smWaCHPmT+Y45Qm8sVjVTvAiSIugBtPrXA0rEVDLgGPze8ELWov
YcZQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744908133; x=1745512933;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=qUKrGIwzX2O6YLsT3blUzRYDgAFe25AKgx7YksHnwEE=;
b=DO8ABjOFtqJyxaAVzy+FayFL1pgAjuAPSUcbvUCME9RdQ34Y9I8rAaAEp06wxrAHTW
YJzmjhDPD3Ib/hgUXlAJXoaE+PDGjPcoHV924cuWMexwApufix6vIuDmUIR2MrmOqjH8
gDTXm1qbsn/PId7dEY7EoSp5dEYsyq6Fn8sAJ7IqlDspEUNZvmwzZ8Y8+C3XDIc25fqN
HYaOFf63ZjJUo1oRqSkDIFi9c4/NNGKgus/RT0lzCSvrwrERm13pEaChyuztpN6m6Puw
e3M61E+00MDpxecUftwV7NMOaCrkQxrbaQtHKkCPxxwEsEjBpiK2eYgiUVKzvrXUROv2
v8rA==
X-Gm-Message-State: AOJu0Yweojk9OHaouGKsjZoRyy91FGMZ3h9fQj/YBHEFqXI9DYj6J+0u
np5EOn96HB++pGOK0C/UxoPPppR/qpzVvl8imZ53drEvTG/vKtfERuGQpA==
X-Gm-Gg: ASbGncurTpcOIjZDEjQzmJX6jIz+qDtvvakYcUJyNPVcwS5tTRpacfecFVQe5FEJ72S
Os5T1xzj1zplL/ROb3yw9/JOWxZ0xQPqNb8QLQd7FH00udnsRkuzj+tE/2lhuYz1/rsMZHBIFGC
Wvyu+ro2WqUkyqVNQbEbPA2vNCTpkx57jFF08nmszpgXA7BGF12ANtyOYkqvWSBFrx+yPyetsEH
ZHw5SEdJ1d51v9tfGUjOr380gWx1Yw0hF/EyNNJ6p6pCKIMO9AW6nNdYH2OUetTfrBhJO9gB4I+
JivHOo9U3tIBFMgbMUJZpQbpuC5XnytXVu2qCqho9xOxiYwjy7834Tmj8LRy
X-Google-Smtp-Source: AGHT+IFG7iWBmVXV/nXa8SCmkAAz8MXYgKzyFfQAmX2XGGxs5RWLIzRQIHDHyGCZlVipX5Dmq4dBEQ==
X-Received: by 2002:a17:902:da89:b0:223:569d:9a8b with SMTP id
d9443c01a7336-22c358de2d8mr92519755ad.18.1744908133321;
Thu, 17 Apr 2025 09:42:13 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b000:82e:7cc9:b5ee:99ff:e770])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22c50fde74fsm1875735ad.220.2025.04.17.09.42.11
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 17 Apr 2025 09:42:12 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 17 Apr 2025 13:41:58 -0300
Message-ID: <20250417164158.7904-1-jamrial@gmail.com>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] avcodec/libvvenc: use av_vlog to print
external library log messages
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250417164158.7904-1-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
And improve the vvencMsgLevel <-> AV_LOG_* mapping.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/libvvenc.c | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/libavcodec/libvvenc.c b/libavcodec/libvvenc.c
index 29a49ba091..c71fd78f1e 100644
--- a/libavcodec/libvvenc.c
+++ b/libavcodec/libvvenc.c
@@ -63,14 +63,29 @@ typedef struct VVenCContext {
static void vvenc_log_callback(void *ctx, int level,
const char *fmt, va_list args)
{
- vvenc_config params;
- vvencEncoder *encoder = ctx;
- if (encoder) {
- vvenc_config_default(¶ms);
- vvenc_get_config(encoder, ¶ms);
- if ((int)params.m_verbosity >= level)
- vfprintf(level == 1 ? stderr : stdout, fmt, args);
+ AVCodecContext *avctx = ctx;
+
+ switch (level) {
+ case VVENC_ERROR:
+ level = AV_LOG_ERROR;
+ break;
+ case VVENC_WARNING:
+ level = AV_LOG_WARNING;
+ break;
+ case VVENC_INFO:
+ level = AV_LOG_INFO;
+ break;
+ case VVENC_NOTICE:
+ case VVENC_VERBOSE:
+ level = AV_LOG_VERBOSE;
+ break;
+ case VVENC_DETAILS:
+ level = AV_LOG_DEBUG;
+ break;
+ default:
+ return;
}
+ av_vlog(avctx, level, fmt, args);
}
static void vvenc_set_verbository(vvenc_config *params)
@@ -82,7 +97,11 @@ static void vvenc_set_verbository(vvenc_config *params)
else if (loglevel >= AV_LOG_VERBOSE)
params->m_verbosity = VVENC_NOTICE;
else if (loglevel >= AV_LOG_INFO)
+ params->m_verbosity = VVENC_INFO;
+ else if (loglevel >= AV_LOG_WARNING)
params->m_verbosity = VVENC_WARNING;
+ else if (loglevel >= AV_LOG_ERROR)
+ params->m_verbosity = VVENC_ERROR;
}
static void vvenc_set_pic_format(AVCodecContext *avctx, vvenc_config *params)
@@ -300,7 +319,7 @@ static av_cold int vvenc_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
}
- vvenc_set_msg_callback(¶ms, s->encoder, vvenc_log_callback);
+ vvenc_set_msg_callback(¶ms, avctx, vvenc_log_callback);
ret = vvenc_encoder_open(s->encoder, ¶ms);
if (ret != 0) {
av_log(avctx, AV_LOG_ERROR, "cannot open libvvenc encoder: %s\n",
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".