From patchwork Mon Jul 22 07:13:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 14032 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 C3FFC448DAD for ; Mon, 22 Jul 2019 10:15:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A06DC68AAF4; Mon, 22 Jul 2019 10:15:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m964.mail.126.com (mail-m964.mail.126.com [123.126.96.4]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83ACB68A7C5 for ; Mon, 22 Jul 2019 10:15:09 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=gVm6m+FU1+Zsd3WI+n QEnY6SGe1lZGYCIlg60f94FAo=; b=UcZr4SndtFbOu7nNAo4QtaCn3X0Y7D+Qc9 EVqUIZ+WTI08LvYpWT5Sq9bzh4uMuOyLwoGloUFwJinHqc85URo0oQ/khyR1DIff 7FsxXA+5KYc3BBoJ+B7oUSedazrsCqgu9YV4fw/vTT3y0zsuaBfVAO3B+6hlITfG XQUhRVU9Y= Received: from localhost.localdomain (unknown [210.22.22.131]) by smtp9 (Coremail) with SMTP id NeRpCgC3EhV4YjVdVAOtFA--.161S5; Mon, 22 Jul 2019 15:15:07 +0800 (CST) From: hwrenx To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jul 2019 15:13:54 +0800 Message-Id: <1563779635-20749-3-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563779635-20749-1-git-send-email-hwrenx@126.com> References: <4B77BA39-17B7-4433-9EC9-5E47A0DD989A@gmx.de> <1563779635-20749-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: NeRpCgC3EhV4YjVdVAOtFA--.161S5 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw15Ar43Cw47WF18Ww18Grg_yoWkCFg_uF 15XryDZ347Aan7Gay3JrZ0kryfZrZ5Cr47GFs2yr4xWF9rXw4YqwsxArnxAFnxur4Sqa4Y k34kAr93Jr18JjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnLL0UUUUUU== X-Originating-IP: [210.22.22.131] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZhv56VpD7ZK5UgAAsg Subject: [FFmpeg-devel] [PATCH v5 2/3] lavc/libdavs2.c: fix decoder info level setting 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwrenx --- libavcodec/libdavs2.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 218f3ec..6d66209 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -37,14 +37,29 @@ typedef struct DAVS2Context { }DAVS2Context; +static int davs2_log_get_level(int log_level) +{ + if (log_level <= AV_LOG_ERROR) + return DAVS2_LOG_ERROR; + + if (log_level <= AV_LOG_WARNING) + return DAVS2_LOG_WARNING; + + if (log_level <= AV_LOG_INFO) + return DAVS2_LOG_INFO; + + return DAVS2_LOG_DEBUG; +} + static av_cold int davs2_init(AVCodecContext *avctx) { DAVS2Context *cad = avctx->priv_data; int cpu_flags = av_get_cpu_flags(); + int log_level = av_log_get_level(); /* init the decoder */ cad->param.threads = avctx->thread_count; - cad->param.info_level = 0; + cad->param.info_level = davs2_log_get_level(log_level); cad->param.disable_avx = !(cpu_flags & AV_CPU_FLAG_AVX && cpu_flags & AV_CPU_FLAG_AVX2); cad->decoder = davs2_decoder_open(&cad->param);