From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH 03/10] avfilter/dnn: add log context to ff_get_dnn_module
Date: Sun, 30 Apr 2023 23:38:55 +0800
Message-ID: <tencent_8AE1B7106BB60265692A7D2AAC963B95C00A@qq.com> (raw)
In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
Print backend type when failed.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
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".
next prev parent reply other threads:[~2023-04-30 15:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230430153902.48405-1-quinkblack@foxmail.com>
2023-04-30 15:38 ` [FFmpeg-devel] [PATCH 02/10] avfilter/dnn: refactor ff_get_dnn_module to remove allocation Zhao Zhili
2023-04-30 15:38 ` Zhao Zhili [this message]
2023-04-30 15:38 ` [FFmpeg-devel] [PATCH 04/10] avfilter/vf_dnn_classify: replace magic number by enum value Zhao Zhili
2023-04-30 15:38 ` [FFmpeg-devel] [PATCH 05/10] avfilter/vf_dnn_detect: " Zhao Zhili
2023-04-30 15:38 ` [FFmpeg-devel] [PATCH 06/10] avfilter/vf_dnn_processing: " Zhao Zhili
2023-04-30 15:38 ` [FFmpeg-devel] [PATCH 07/10] avfilter/dnn_backend_tf: remove unused define Zhao Zhili
2023-04-30 15:39 ` [FFmpeg-devel] [PATCH 08/10] avfilter/dnn_backend_tf: check TF_OperationOutputType return value Zhao Zhili
2023-04-30 15:39 ` [FFmpeg-devel] [PATCH 09/10] avfilter/dnn_backend_tf: fix use of uninitialized value Zhao Zhili
2023-04-30 15:39 ` [FFmpeg-devel] [PATCH 10/10] avfilter/dnn_backend_tf: silence implicit cast warning Zhao Zhili
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_8AE1B7106BB60265692A7D2AAC963B95C00A@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git