From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id F046445FFA for ; Sun, 30 Apr 2023 15:47:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 56C3268C074; Sun, 30 Apr 2023 18:47:37 +0300 (EEST) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 813CB68BF1D for ; Sun, 30 Apr 2023 18:47:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869647; bh=X9k6pTVvqT2IDxE+SNcFMDfdfmgah36xblnbE2qSHOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rfzb9BLBx8qDk3EvQrM2FQgPFgFfTC2zSmHUD6ld79KXCLPtW4Hlhy5FYDeZb0xsS vKfYNZ1oYrwoS0BHWKKsBknHnsJrbaHFv2pK3UhtL+78Hs/6cv8sbvPkyX3CMzBCLQ so7ahJkC8TBXpodK4egpp9xrVXx8ywhaankiL7go= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869156t7iy6rx60 Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uTgalkk4BtdDMkRJIQmIfy+zat9Td4IclbraQftWHivJpNCo4X9U Z/8OgDi1B/vVQG/zMGVuZ5pmg8XzlVdEowYoWYUIan2u5RllMtRb/Vjkm7UCMfCdsTdYQATeD4gy criYpY/FdgHSm/M+5rbGmlDExhzr3rcl7N/AYuUBLfHLYWp5cBCiuZuDuPIZYCBb6OCwsJMOEKY2 5kCS4PDjIRe8udxd1GlibsbuifSpbRCGFB2lUUdbfm54g5gUt5zV5YkujPEH/54m8+Du5l3Aq+mV QVLyzfQrxIir9f1jf6y0xWBrjhK6DNOScNsePL63IZF3s0UNaFvxGP6IPEyUbmXvJTnjQ9JZSx40 rfwJvoPaieRbqHyI0ewdaACK3Davo9TCRih9+j21LRqAtesXgXn8avBvfFS15Ux/zZyODeGpcBFV gbEU0OpHBSF4NYoffsdPhDbYXfacieg+ckbZ+XHl7s3a4y9PU872AWgIeg5pEePdGbxHdYARkKZJ kk+lcR9E26fJ1Dg2WDeUmy78rAopJ1wxxLXg3VcsEkByL5s8Ne1879BU9T5RF3UNOxnZXPCZx9Uj YD2C7/fAt6T2k6IJmRHoIdKZHbpJMq1nQ/yh6mvvkoekfN1ZvOQYFOopVChe7KgZlaMZjDzyKNPx srOfugmmNKhtUrjzoTQPrvxFu0hwZg1lDmb4NdMHuFaeexeA1hnPmYVPlVSWCTNsF7YlSO2hwMMF Hio/4efPckir2YaeYuQtTAUbo9WuEcp4vUiNCBtWp98S4PaWcU5BjHpgY9uPpPZw4f6YK16skWrj gHabIe4Gr3I1OQBV0hCJZ1is4TbpU1AK8WhLVE6QXkF8OypP0LVcp9H3iqOhM2WpzItPVwgZzPLS hnqqO2imh4ZxSjmxp1e5gYEEvjyhBdR8vvlb8L0S0TDhsUyaHXGKLRl5NAk9Y5lEij0qKYQhYJAj 7zxat/0ZhJ3vOKHTP0E2yX2/fRaWTb From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:55 +0800 X-OQ-MSGID: <20230430153902.48405-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avfilter/dnn: add log context to ff_get_dnn_module 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Print backend type when failed. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_interface.c | 6 ++++-- libavfilter/dnn_filter_common.c | 2 +- libavfilter/dnn_interface.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index a60dcb091b..e843826aa6 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -29,7 +29,7 @@ extern const DNNModule ff_dnn_backend_openvino; extern const DNNModule ff_dnn_backend_tf; -const DNNModule *ff_get_dnn_module(DNNBackendType backend_type) +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type, void *log_ctx) { switch(backend_type){ #if (CONFIG_LIBTENSORFLOW == 1) @@ -41,7 +41,9 @@ const DNNModule *ff_get_dnn_module(DNNBackendType backend_type) return &ff_dnn_backend_openvino; #endif default: - av_log(NULL, AV_LOG_ERROR, "Module backend_type is not supported or enabled.\n"); + av_log(log_ctx, AV_LOG_ERROR, + "Module backend_type %d is not supported or enabled.\n", + backend_type); return NULL; } } diff --git a/libavfilter/dnn_filter_common.c b/libavfilter/dnn_filter_common.c index 7b34fd0c0a..d175c91914 100644 --- a/libavfilter/dnn_filter_common.c +++ b/libavfilter/dnn_filter_common.c @@ -68,7 +68,7 @@ int ff_dnn_init(DnnContext *ctx, DNNFunctionType func_type, AVFilterContext *fil return AVERROR(EINVAL); } - ctx->dnn_module = ff_get_dnn_module(ctx->backend_type); + ctx->dnn_module = ff_get_dnn_module(ctx->backend_type, filter_ctx); if (!ctx->dnn_module) { av_log(filter_ctx, AV_LOG_ERROR, "could not create DNN module for requested backend\n"); return AVERROR(ENOMEM); diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index b2bfdd38e7..20c6a0a896 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -123,6 +123,6 @@ typedef struct DNNModule{ } DNNModule; // Initializes DNNModule depending on chosen backend. -const DNNModule *ff_get_dnn_module(DNNBackendType backend_type); +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type, void *log_ctx); #endif -- 2.40.1 _______________________________________________ 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".