* [FFmpeg-devel] [PATCH 2/3] avfilter/dnn_backend_openvino: fix multiple memleaks [not found] <20230818175232.260691-1-quinkblack@foxmail.com> @ 2023-08-18 17:52 ` Zhao Zhili 2023-08-18 17:52 ` [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov Zhao Zhili 1 sibling, 0 replies; 3+ messages in thread From: Zhao Zhili @ 2023-08-18 17:52 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Zhao Zhili From: Zhao Zhili <zhilizhao@tencent.com> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> --- libavfilter/dnn/dnn_backend_openvino.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 46cbe8270e..071516b17d 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -326,6 +326,9 @@ static void dnn_free_model_ov(DNNModel **model) ie_network_free(&ov_model->network); if (ov_model->core) ie_core_free(&ov_model->core); + av_free(ov_model->all_output_names); + av_free(ov_model->all_input_names); + av_opt_free(&ov_model->ctx); av_freep(&ov_model); av_freep(model); } @@ -821,6 +824,7 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f goto err; } APPEND_STRING(ov_model->all_input_names, node_name) + ie_network_name_free(&node_name); } status = ie_network_get_outputs_number(ov_model->network, &node_count); if (status != OK) { @@ -834,6 +838,7 @@ static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType f goto err; } APPEND_STRING(ov_model->all_output_names, node_name) + ie_network_name_free(&node_name); } model->get_input = &get_input_ov; -- 2.25.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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov [not found] <20230818175232.260691-1-quinkblack@foxmail.com> 2023-08-18 17:52 ` [FFmpeg-devel] [PATCH 2/3] avfilter/dnn_backend_openvino: fix multiple memleaks Zhao Zhili @ 2023-08-18 17:52 ` Zhao Zhili 2023-08-30 12:33 ` Guo, Yejun 1 sibling, 1 reply; 3+ messages in thread From: Zhao Zhili @ 2023-08-18 17:52 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Zhao Zhili From: Zhao Zhili <zhilizhao@tencent.com> No functional changes. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> --- libavfilter/dnn/dnn_backend_openvino.c | 75 +++++++++++++------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 071516b17d..6afc80eda5 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -294,44 +294,47 @@ static void infer_completion_callback(void *args) static void dnn_free_model_ov(DNNModel **model) { - if (*model){ - OVModel *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) { - ie_infer_request_free(&item->infer_request); - } - av_freep(&item->lltasks); - av_freep(&item); - } - ff_safe_queue_destroy(ov_model->request_queue); - - while (ff_queue_size(ov_model->lltask_queue) != 0) { - LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); - av_freep(&item); - } - ff_queue_destroy(ov_model->lltask_queue); + OVModel *ov_model; - while (ff_queue_size(ov_model->task_queue) != 0) { - TaskItem *item = ff_queue_pop_front(ov_model->task_queue); - av_frame_free(&item->in_frame); - av_frame_free(&item->out_frame); - av_freep(&item); - } - ff_queue_destroy(ov_model->task_queue); + if (!*model) + return; - if (ov_model->exe_network) - ie_exec_network_free(&ov_model->exe_network); - if (ov_model->network) - ie_network_free(&ov_model->network); - if (ov_model->core) - ie_core_free(&ov_model->core); - av_free(ov_model->all_output_names); - av_free(ov_model->all_input_names); - av_opt_free(&ov_model->ctx); - av_freep(&ov_model); - av_freep(model); - } + 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) { + ie_infer_request_free(&item->infer_request); + } + av_freep(&item->lltasks); + av_freep(&item); + } + ff_safe_queue_destroy(ov_model->request_queue); + + while (ff_queue_size(ov_model->lltask_queue) != 0) { + LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); + av_freep(&item); + } + ff_queue_destroy(ov_model->lltask_queue); + + while (ff_queue_size(ov_model->task_queue) != 0) { + TaskItem *item = ff_queue_pop_front(ov_model->task_queue); + av_frame_free(&item->in_frame); + av_frame_free(&item->out_frame); + av_freep(&item); + } + ff_queue_destroy(ov_model->task_queue); + + if (ov_model->exe_network) + ie_exec_network_free(&ov_model->exe_network); + if (ov_model->network) + ie_network_free(&ov_model->network); + if (ov_model->core) + ie_core_free(&ov_model->core); + av_free(ov_model->all_output_names); + av_free(ov_model->all_input_names); + av_opt_free(&ov_model->ctx); + av_freep(&ov_model); + av_freep(model); } -- 2.25.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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov 2023-08-18 17:52 ` [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov Zhao Zhili @ 2023-08-30 12:33 ` Guo, Yejun 0 siblings, 0 replies; 3+ messages in thread From: Guo, Yejun @ 2023-08-30 12:33 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Zhao Zhili > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of > Zhao Zhili > Sent: Saturday, August 19, 2023 1:53 AM > To: ffmpeg-devel@ffmpeg.org > Cc: Zhao Zhili <zhilizhao@tencent.com> > Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: > reduce indentation in free_model_ov > > From: Zhao Zhili <zhilizhao@tencent.com> > > No functional changes. > > Signed-off-by: Zhao Zhili <zhilizhao@tencent.com> > --- Looks good, but could you re-send v2 against latest code? Thanks. _______________________________________________ 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-30 12:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20230818175232.260691-1-quinkblack@foxmail.com>
2023-08-18 17:52 ` [FFmpeg-devel] [PATCH 2/3] avfilter/dnn_backend_openvino: fix multiple memleaks Zhao Zhili
2023-08-18 17:52 ` [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov Zhao Zhili
2023-08-30 12:33 ` Guo, Yejun
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