From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/dnn_backend_tf: check TF_OperationOutputType return value
Date: Sun, 30 Apr 2023 23:39:00 +0800
Message-ID: <tencent_5F49D3E6F36255CBA90EAEB62556F30EE805@qq.com> (raw)
In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
This also fixed a warning: implicit conversion from enumeration
type 'TF_DataType' (aka 'enum TF_DataType') to different
enumeration type 'DNNDataType'.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
libavfilter/dnn/dnn_backend_tf.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c
index 74fe06d6fb..552a9f2fa1 100644
--- a/libavfilter/dnn/dnn_backend_tf.c
+++ b/libavfilter/dnn/dnn_backend_tf.c
@@ -274,6 +274,7 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name)
TFModel *tf_model = model;
TFContext *ctx = &tf_model->ctx;
TF_Status *status;
+ TF_DataType dt;
int64_t dims[4];
TF_Output tf_output;
@@ -284,7 +285,18 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name)
}
tf_output.index = 0;
- input->dt = TF_OperationOutputType(tf_output);
+ dt = TF_OperationOutputType(tf_output);
+ switch (dt) {
+ case TF_FLOAT:
+ input->dt = DNN_FLOAT;
+ break;
+ case TF_UINT8:
+ input->dt = DNN_UINT8;
+ break;
+ default:
+ av_log(ctx, AV_LOG_ERROR, "Unsupported output type %d in model\n", dt);
+ return AVERROR(EINVAL);
+ }
input->order = DCO_RGB;
status = TF_NewStatus();
--
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:40 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 ` [FFmpeg-devel] [PATCH 03/10] avfilter/dnn: add log context to ff_get_dnn_module Zhao Zhili
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 ` Zhao Zhili [this message]
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_5F49D3E6F36255CBA90EAEB62556F30EE805@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