From patchwork Mon Oct 15 05:08:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 10677 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 BC5FB4440FD for ; Mon, 15 Oct 2018 08:08:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DD8E68075B; Mon, 15 Oct 2018 08:08:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48FCD680739 for ; Mon, 15 Oct 2018 08:08:00 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id m77-v6so9039842pfi.8 for ; Sun, 14 Oct 2018 22:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+Uk1eVyBoMSrf8dZz3ZkMZu6D/1SkR5DJElnAl0HTXw=; b=KBk/amVQW85jC6bCO1L83sW7qLc0D7CEWJVAMV0FF/5xkEFKo6TAhmKNASNpvvhDCy 8lWs/DPse5Z9+pVbj9a+2o7Aq846y90+W9hvMarRIE2WAtaISPgRewlXQSirmgS40bfn /A5IPOY4BDzPLkuIL7YT0FZcZoDDsXS4NjHC3oZEiOuYUKe3mYys3KBU0b3W5I3GinRI QmEvj7npVZmvWsHNhnUoSXQznrV3EGsDGXcxSiqgc5BTy7v7Mbj3013jumBhHV8aC89d t0dSLqAN1t5ZQEf42VyUSuEHbZOQ8GhXmM6+3gFiOSIU2k3cUybJyZECRn8f3BoYB1vt oz3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+Uk1eVyBoMSrf8dZz3ZkMZu6D/1SkR5DJElnAl0HTXw=; b=HCJ73FuHbLkMk8xge8Vu/GVKuYbl7nDdutwc8RmvebPZuWkfGWXeXu6zx6+DnFk5CI pyhWBe34Yq5VCfIu9CNSpskap6+i8/XgL+b+SkkpJNloXJr5vYZsj4I1c899BK90F5Nc rgDGD0ZLO9slVn1YoaFzNhmC59sgL4elTOknL2+qF3zIPmUrBYNwhUHcVNUUB2Gx62tj cAXwNpuyxaEb+XpDqXwRj4t0VTgXGIJM0FLSM0N1vCAWw7/2VanCs5JWSJOcVKsxonhh IeeF82WDue+pc/3wtrqQuHOw8QcYns0D5XkBy5aOHOf7fmv7qmpVyjDr6VSENUIWxzaB MEUw== X-Gm-Message-State: ABuFfoi187GbXa3QyuRBnxJogB2MCyaNt29QRKLd3FhOM+uj4+HMR/Hx FF+bQ8vsW928cjJbOPJLwRE5LEUJ X-Google-Smtp-Source: ACcGV626ug4p9dutDT4z/0aQcjktTiUKjFlMr/TGoF0kGJmXpXg6cfqw4aVys2wpWWwB+5kjSf/0tg== X-Received: by 2002:a63:4b25:: with SMTP id y37-v6mr14692865pga.14.1539580102449; Sun, 14 Oct 2018 22:08:22 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y24-v6sm16181291pfi.24.2018.10.14.22.08.19 (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 14 Oct 2018 22:08:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Oct 2018 13:08:10 +0800 Message-Id: <1539580090-80513-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.6.4 Subject: [FFmpeg-devel] [PATCH] libavcodec/libx265.c: support for the x265 loglevel configured with ffmpeg loglevel option 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang --- libavcodec/libx265.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 27c90b3..3a08767 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -108,6 +108,24 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } + switch (av_log_get_level()) { + case AV_LOG_ERROR: + ctx->params->logLevel = X265_LOG_ERROR; + break; + case AV_LOG_INFO: + ctx->params->logLevel = X265_LOG_INFO; + break; + case AV_LOG_DEBUG: + ctx->params->logLevel = X265_LOG_DEBUG; + break; + case AV_LOG_WARNING: + ctx->params->logLevel = X265_LOG_WARNING; + break; + case AV_LOG_TRACE: + ctx->params->logLevel = X265_LOG_FULL; + break; + } + ctx->params->frameNumThreads = avctx->thread_count; ctx->params->fpsNum = avctx->time_base.den; ctx->params->fpsDenom = avctx->time_base.num * avctx->ticks_per_frame;