From patchwork Mon Mar 4 21:06:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12190 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 12BA94485FE for ; Mon, 4 Mar 2019 23:08:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EECF66899F6; Mon, 4 Mar 2019 23:08:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B918A6807E5 for ; Mon, 4 Mar 2019 23:08:19 +0200 (EET) Received: by mail-qt1-f195.google.com with SMTP id w4so6730500qtc.1 for ; Mon, 04 Mar 2019 13:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=++wZFd/NDuRUYXwNl3Puk9c3tZ2mjtgsmA9lQ4ltLp8=; b=hJ40f+ePTfx3vYUfeDbOf/+w5MIaPEiJrOoCPnE32lWFaJrRHTGpOULb7JBrmVkIgJ H5nirEc4sv/Cpe2XYKMSkcjLxWUbZCenZEhSb6GxPKk1VB+VVrlX25xSs5dYooix407C gzMO+ixyQBzet2Cdq8X0+a6KwALH3AZoDjNbEIesZse8c5+lt2zOEDBpneIw5dYPdIUR v8Yp8Dfy6JHbTRzAf8W6ZS7O1M4abqf+id4Jhp6nPiLJ786h7xN6FI5iTRd2MC0zUNU1 RB7dEI8oYe8e2d+J9EN/i0HRcQHn4DMvgCxDC0B5PGClbTM3pDXIPDwpA2/LlwZhIfXm 0UyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=++wZFd/NDuRUYXwNl3Puk9c3tZ2mjtgsmA9lQ4ltLp8=; b=h1XqYhC9zrvHPe8afqPofGcacRWEq/g4rEqvlQ49zlRN8CVPYK+i4hqyWCzmRa4qTi C0OR8IPrqmOxMUoa8MjU7UFeUXG4I90lqncMtcQzeF7OKyHb+GsxVbi5l8qZE3KSjCXi XQKV5peWrSfY1e5kPdq5Ad81IIfLYOr3zwHu9xbmU5pk/z121tB2QSbUj3fps7drsUPh 8JU5jB9pg0RYfPhvwWDMwNfGt1y3+lOKqHMXi1Z6cpL3QBiWlrQs6CiQK/l9CE4kKJAF WvO6Pzff6bfxGccojRmgqlZ5g63G/htuX1suo+VYjoLCcWLb4RWu/jAYocj1TGcvpqcz k+dg== X-Gm-Message-State: APjAAAVnN4vOSqgRkgxrroJVQqSOR9d0ZxnOml4EjBW4MamTmhbysQmb OMSPwbYp2l3IbYwmT2z/MkV13zHu X-Google-Smtp-Source: APXvYqzPTII6WUc+YJsmJeTc1q3leY9+bfIJ9TG+nP1msXA64+FDl2nlyHFPPLVi08QDAI5bFUhrYg== X-Received: by 2002:a0c:b660:: with SMTP id q32mr16108718qvf.50.1551733697944; Mon, 04 Mar 2019 13:08:17 -0800 (PST) Received: from localhost.localdomain ([181.23.86.217]) by smtp.gmail.com with ESMTPSA id g53sm4642810qte.21.2019.03.04.13.08.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 13:08:17 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2019 18:06:55 -0300 Message-Id: <20190304210656.2412-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libdav1d: route dav1d internal logs through av_log() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Bump the minimum required version to the first one with the logger API callback. Signed-off-by: James Almer --- configure | 2 +- libavcodec/libdav1d.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index dcead3a300..a5cef4bc09 100755 --- a/configure +++ b/configure @@ -6142,7 +6142,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 -enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.1.0" "dav1d/dav1d.h" dav1d_version +enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.2.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index ed02da4ebf..459bbae687 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -37,6 +37,13 @@ typedef struct Libdav1dContext { int apply_grain; } Libdav1dContext; +static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl) +{ + AVCodecContext *c = opaque; + + av_vlog(c, AV_LOG_ERROR, fmt, vl); +} + static av_cold int libdav1d_init(AVCodecContext *c) { Libdav1dContext *dav1d = c->priv_data; @@ -46,6 +53,8 @@ static av_cold int libdav1d_init(AVCodecContext *c) av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); dav1d_default_settings(&s); + s.logger.cookie = c; + s.logger.callback = libdav1d_log_callback; s.n_tile_threads = dav1d->tile_threads; s.apply_grain = dav1d->apply_grain; s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS);