From: Zhao Zhili <quinkblack@foxmail.com>
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
Date: Sat, 19 Aug 2023 01:52:32 +0800
Message-ID: <tencent_FBA4661CD09EE6C727D3EA929315DC4E4B06@qq.com> (raw)
In-Reply-To: <20230818175232.260691-1-quinkblack@foxmail.com>
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".
next prev parent reply other threads:[~2023-08-18 9:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 [this message]
2023-08-30 12:33 ` [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov Guo, Yejun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_FBA4661CD09EE6C727D3EA929315DC4E4B06@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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