Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/dnn_backend_openvino: reduce indentation in free_model_ov

Browse Source 
No functional changes except ensures model isn't null.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
pull/390/head
Zhao Zhili 1 year ago committed by Guo Yejun
parent 5369548f2e
commit 7cb6329296
1 changed files with 46 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 89
      libavfilter/dnn/dnn_backend_openvino.c

89
libavfilter/dnn/dnn_backend_openvino.c
Unescape View File

@ -463,58 +463,61 @@ static void infer_completion_callback(void *args)
static void dnn_free_model_ov(DNNModel **model) static void dnn_free_model_ov(DNNModel **model)
{ {
if (*model){ OVModel *ov_model;
OVModel *ov_model = (*model)->model;
while (ff_safe_queue_size(ov_model->request_queue) != 0) { if (!model || !*model)
OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); return;
if (item && item->infer_request) {
ov_model = (*model)->model;
while (ff_safe_queue_size(ov_model->request_queue) != 0) {
OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue);
if (item && item->infer_request) {
#if HAVE_OPENVINO2 #if HAVE_OPENVINO2
ov_infer_request_free(item->infer_request); ov_infer_request_free(item->infer_request);
#else #else
ie_infer_request_free(&item->infer_request); ie_infer_request_free(&item->infer_request);
#endif #endif
}
av_freep(&item->lltasks);
av_freep(&item);
} }
ff_safe_queue_destroy(ov_model->request_queue); av_freep(&item->lltasks);
av_freep(&item);
}
ff_safe_queue_destroy(ov_model->request_queue);
while (ff_queue_size(ov_model->lltask_queue) != 0) { while (ff_queue_size(ov_model->lltask_queue) != 0) {
LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue);
av_freep(&item); av_freep(&item);
} }
ff_queue_destroy(ov_model->lltask_queue); ff_queue_destroy(ov_model->lltask_queue);
while (ff_queue_size(ov_model->task_queue) != 0) { while (ff_queue_size(ov_model->task_queue) != 0) {
TaskItem *item = ff_queue_pop_front(ov_model->task_queue); TaskItem *item = ff_queue_pop_front(ov_model->task_queue);
av_frame_free(&item->in_frame); av_frame_free(&item->in_frame);
av_frame_free(&item->out_frame); av_frame_free(&item->out_frame);
av_freep(&item); av_freep(&item);
} }
ff_queue_destroy(ov_model->task_queue); ff_queue_destroy(ov_model->task_queue);
#if HAVE_OPENVINO2 #if HAVE_OPENVINO2
if (ov_model->preprocess) if (ov_model->preprocess)
ov_preprocess_prepostprocessor_free(ov_model->preprocess); ov_preprocess_prepostprocessor_free(ov_model->preprocess);
if (ov_model->compiled_model) if (ov_model->compiled_model)
ov_compiled_model_free(ov_model->compiled_model); ov_compiled_model_free(ov_model->compiled_model);
if (ov_model->ov_model) if (ov_model->ov_model)
ov_model_free(ov_model->ov_model); ov_model_free(ov_model->ov_model);
if (ov_model->core) if (ov_model->core)
ov_core_free(ov_model->core); ov_core_free(ov_model->core);
#else #else
if (ov_model->exe_network) if (ov_model->exe_network)
ie_exec_network_free(&ov_model->exe_network); ie_exec_network_free(&ov_model->exe_network);
if (ov_model->network) if (ov_model->network)
ie_network_free(&ov_model->network); ie_network_free(&ov_model->network);
if (ov_model->core) if (ov_model->core)
ie_core_free(&ov_model->core); ie_core_free(&ov_model->core);
av_free(ov_model->all_output_names); av_free(ov_model->all_output_names);
av_free(ov_model->all_input_names); av_free(ov_model->all_input_names);
#endif #endif
av_opt_free(&ov_model->ctx); av_opt_free(&ov_model->ctx);
av_freep(&ov_model); av_freep(&ov_model);
av_freep(model); av_freep(model);
}
} }

Write Preview
Loading…
Cancel
Save