RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavfilter/dnn: add prefix ff_ for internal functions 

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.guo@intel.com>
This commit is contained in:
Guo, Yejun 2021-01-18 16:00:58 +08:00
parent 2d6af4a501
commit c5e30d588d
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/dnn/dnn_backend_native.c
View File

@ -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;

4
libavfilter/dnn/dnn_backend_openvino.c
View File

@ -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;

4
libavfilter/dnn/dnn_backend_tf.c
View File

@ -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;

4
libavfilter/dnn/dnn_io_proc.c
View File

@ -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);
@ -92,7 +92,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);

4
libavfilter/dnn/dnn_io_proc.h
View File

@ -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