From: "Guo, Yejun" <yejun....@intel.com>
from proc_from_frame_to_dnn to ff_proc_from_frame_to_dnn, and
from proc_from_dnn_to_frame to ff_proc_from_dnn_to_frame.
Signed-off-by: Guo, Yejun <yejun....@intel.com>
---
This was sent a few days ago to fix some of these issues, and is included here
because it is needed for the test in 5/5 to pass.
libavfilter/dnn/dnn_backend_native.c | 4 ++--
libavfilter/dnn/dnn_backend_openvino.c | 4 ++--
libavfilter/dnn/dnn_backend_tf.c | 4 ++--
libavfilter/dnn/dnn_io_proc.c | 4 ++--
libavfilter/dnn/dnn_io_proc.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libavfilter/dnn/dnn_backend_native.c
b/libavfilter/dnn/dnn_backend_native.c
index ffb79dc000..0094ec5444 100644
--- a/libavfilter/dnn/dnn_backend_native.c
+++ b/libavfilter/dnn/dnn_backend_native.c
@@ -320,7 +320,7 @@ static DNNReturnType execute_model_native(const DNNModel
*model, const char *inp
if (native_model->model->pre_proc != NULL) {
native_model->model->pre_proc(in_frame, &input,
native_model->model->filter_ctx);
} else {
- proc_from_frame_to_dnn(in_frame, &input, ctx);
+ ff_proc_from_frame_to_dnn(in_frame, &input, ctx);
}
}
@@ -368,7 +368,7 @@ static DNNReturnType execute_model_native(const DNNModel
*model, const char *inp
if (native_model->model->post_proc != NULL) {
native_model->model->post_proc(out_frame, &output,
native_model->model->filter_ctx);
} else {
- proc_from_dnn_to_frame(out_frame, &output, ctx);
+ ff_proc_from_dnn_to_frame(out_frame, &output, ctx);
}
} else {
out_frame->width = output.width;
diff --git a/libavfilter/dnn/dnn_backend_openvino.c
b/libavfilter/dnn/dnn_backend_openvino.c
index 8a7abb33f0..d5b83cef97 100644
--- a/libavfilter/dnn/dnn_backend_openvino.c
+++ b/libavfilter/dnn/dnn_backend_openvino.c
@@ -160,7 +160,7 @@ static DNNReturnType fill_model_input_ov(OVModel *ov_model,
RequestItem *request
if (ov_model->model->pre_proc != NULL) {
ov_model->model->pre_proc(task->in_frame, &input,
ov_model->model->filter_ctx);
} else {
- proc_from_frame_to_dnn(task->in_frame, &input, ctx);
+ ff_proc_from_frame_to_dnn(task->in_frame, &input, ctx);
}
}
input.data = (uint8_t *)input.data
@@ -228,7 +228,7 @@ static void infer_completion_callback(void *args)
if (task->ov_model->model->post_proc != NULL) {
task->ov_model->model->post_proc(task->out_frame, &output,
task->ov_model->model->filter_ctx);
} else {
- proc_from_dnn_to_frame(task->out_frame, &output, ctx);
+ ff_proc_from_dnn_to_frame(task->out_frame, &output, ctx);
}
} else {
task->out_frame->width = output.width;
diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c
index b9fe01693b..81a55bfed5 100644
--- a/libavfilter/dnn/dnn_backend_tf.c
+++ b/libavfilter/dnn/dnn_backend_tf.c
@@ -743,7 +743,7 @@ static DNNReturnType execute_model_tf(const DNNModel
*model, const char *input_n
if (tf_model->model->pre_proc != NULL) {
tf_model->model->pre_proc(in_frame, &input,
tf_model->model->filter_ctx);
} else {
- proc_from_frame_to_dnn(in_frame, &input, ctx);
+ ff_proc_from_frame_to_dnn(in_frame, &input, ctx);
}
}
@@ -800,7 +800,7 @@ static DNNReturnType execute_model_tf(const DNNModel
*model, const char *input_n
if (tf_model->model->post_proc != NULL) {
tf_model->model->post_proc(out_frame, &output,
tf_model->model->filter_ctx);
} else {
- proc_from_dnn_to_frame(out_frame, &output, ctx);
+ ff_proc_from_dnn_to_frame(out_frame, &output, ctx);
}
} else {
out_frame->width = output.width;
diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c
index 2744cb6502..3ed8a98a39 100644
--- a/libavfilter/dnn/dnn_io_proc.c
+++ b/libavfilter/dnn/dnn_io_proc.c
@@ -22,7 +22,7 @@
#include "libavutil/imgutils.h"
#include "libswscale/swscale.h"
-DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void
*log_ctx)
+DNNReturnType ff_proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void
*log_ctx)
{
struct SwsContext *sws_ctx;
int bytewidth = av_image_get_linesize(frame->format, frame->width, 0);
@@ -93,7 +93,7 @@ DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData
*output, void *log_
return DNN_SUCCESS;
}
-DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void
*log_ctx)
+DNNReturnType ff_proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void
*log_ctx)
{
struct SwsContext *sws_ctx;
int bytewidth = av_image_get_linesize(frame->format, frame->width, 0);
diff --git a/libavfilter/dnn/dnn_io_proc.h b/libavfilter/dnn/dnn_io_proc.h
index 4c7dc7c1a2..6a410ccc7b 100644
--- a/libavfilter/dnn/dnn_io_proc.h
+++ b/libavfilter/dnn/dnn_io_proc.h
@@ -30,7 +30,7 @@
#include "../dnn_interface.h"
#include "libavutil/frame.h"
-DNNReturnType proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void
*log_ctx);
-DNNReturnType proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void
*log_ctx);
+DNNReturnType ff_proc_from_frame_to_dnn(AVFrame *frame, DNNData *input, void
*log_ctx);
+DNNReturnType ff_proc_from_dnn_to_frame(AVFrame *frame, DNNData *output, void
*log_ctx);
#endif
--
2.29.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
