har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/dnn: Add nb_output to TaskItem

Browse Source 
Add nb_output property to TaskItem for use in TensorFlow backend
and Native backend.

Signed-off-by: Shubhanshu Saxena <shubhanshu.e01@gmail.com>
This commit is contained in:
Shubhanshu Saxena 2021-06-05 23:38:04 +05:30 committed by Guo Yejun
parent 446b4f77c1
commit 9675ebbb91
2 changed files with 4 additions and 0 deletions

1
libavfilter/dnn/dnn_backend_common.h

@ -35,6 +35,7 @@ typedef struct TaskItem {
const char **output_names; const char **output_names;
int async; int async;
int do_ioproc; int do_ioproc;
uint32_t nb_output;
uint32_t inference_todo; uint32_t inference_todo;
uint32_t inference_done; uint32_t inference_done;
} TaskItem; } TaskItem;

3
libavfilter/dnn/dnn_backend_openvino.c

@ -678,6 +678,7 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu
task.in_frame = in_frame; task.in_frame = in_frame;
task.output_names = &output_name; task.output_names = &output_name;
task.out_frame = out_frame; task.out_frame = out_frame;
task.nb_output = 1;
task.model = ov_model; task.model = ov_model;
if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, NULL) != DNN_SUCCESS) { if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, NULL) != DNN_SUCCESS) {
@ -798,6 +799,7 @@ DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *
task.in_frame = exec_params->in_frame; task.in_frame = exec_params->in_frame;
task.output_names = &exec_params->output_names[0]; task.output_names = &exec_params->output_names[0];
task.out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame; task.out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame;
task.nb_output = exec_params->nb_output;
task.model = ov_model; task.model = ov_model;
if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, exec_params) != DNN_SUCCESS) { if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, exec_params) != DNN_SUCCESS) {
@ -845,6 +847,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, DNNExecBasePa
task->in_frame = exec_params->in_frame; task->in_frame = exec_params->in_frame;
task->output_names = &exec_params->output_names[0]; task->output_names = &exec_params->output_names[0];
task->out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame; task->out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame;
task->nb_output = exec_params->nb_output;
task->model = ov_model; task->model = ov_model;
if (ff_queue_push_back(ov_model->task_queue, task) < 0) { if (ff_queue_push_back(ov_model->task_queue, task) < 0) {
av_freep(&task); av_freep(&task);