From patchwork Fri Aug 18 17:52:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43255 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2548177pzb; Fri, 18 Aug 2023 02:53:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwUOOoQRBJvad4HifP0ujz7xIlnEfrJO0TtwwE24XwURvPjQf15FXoodEo48jA2zbeRzLm X-Received: by 2002:a17:906:535d:b0:99d:ddae:f5d4 with SMTP id j29-20020a170906535d00b0099dddaef5d4mr1594628ejo.44.1692352392494; Fri, 18 Aug 2023 02:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692352392; cv=none; d=google.com; s=arc-20160816; b=vEJyj4fLZB3vL41OG5nYyXpo3YTDXO3aXOOBKdCiwlMZhbY48Vm/shDl0BLkiOvof4 XKm3d6gnuCxX/ceDgdBolnG4LL8Upkgj8m1ZofF3hLmPDHsf1ze52cLNvKBu5OGmz2WV QPVj+SI80REZCOGM//AjfeykmWUbCSPO2Eug1bRV/2cPYpP2K5WZfZi9Iba8F6CJvH1m saq7VCsmJt0Ltgl/L12CpBZhUPuRsveKEs5DA5puZjYC+bxgCJgerkN7mGAOa5yCAlcv wmSafxvUzLIU/jvk6t00ReUhw79jxKybnQl4vhHjme9VrdioLT9jdFJagqVqJGFDUL19 Lrtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=IKP9tGyhhLp66c4F7L5t0MBRkHxDiCMCztyqOAUiKvs=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=M8YiCXzCZAU4ABDE+bOcFnBmFD2rviq970kiQ6ISJamRNDtoz2yoOHSfK1mGvDmqzO 0fzGT6RFLdFamNR+l014ffkrAalNzb4JnfXTaGNXGQF+CSWejQBE1yHi4Uf3NCjR1trz feIxIryWlIY25Fb9JXuCROP/jlHrl1/pUxQyaifbYk66fuHiqaBsPdvF6qkVntWWDZdK ZNfpInklwXHOxlW8blyjRq211UfXtLi6tAssZ8Tu18hDHCuNs8PKMYuaKVmO4GzjWyxj Bn25dGkUSstFweO58sb4toq9960BKCkGh1jgp/dMhhf8pMvelP/8lLh1YrHsj0uOo9QB wauQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XAznZVD4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g26-20020a1709063b1a00b00988a7f7cd11si1173877ejf.515.2023.08.18.02.53.12; Fri, 18 Aug 2023 02:53:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XAznZVD4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1442C68C6C4; Fri, 18 Aug 2023 12:52:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 853DD68C642 for ; Fri, 18 Aug 2023 12:52:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1692352354; bh=NVk2veFRvTJ171sRY0Ji9nzBnkXWLoJ9rDsix2+2WVA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XAznZVD4ICNGb2R1YaOll9bOk20SJkP+KWjfu/XZ41yipsrQ0B+ZDcQ1TYumCHRKR GsxN5FbKNgQr0ioxCpxD9HB9Ud7I2mQBTydhy2U1DvvhymYND4F/0zfELfMaXdghCP SRLPSLUwZNUjZQVGfXytqUojsQByHIbS+4i/MJCI= Received: from localhost.localdomain ([113.108.77.66]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id D20AA036; Fri, 18 Aug 2023 17:52:32 +0800 X-QQ-mid: xmsmtpt1692352354tm11znivy Message-ID: X-QQ-XMAILINFO: NSmesZGuqQTYS/mwLAD+K33fZ9bKcVFAnRY27WnrtIJcXmUMZAZQX15AOQVqnE 4XtOqNTdlThHWzBljTjAVSAwmlaCsP5kvqh4QeovKl3xGaX0hTOtdsj+rct1515sNHXusQ4wqCJq IzZcnEX0VY0rAqgVDEJWkhc2bTF6nDL3UvGi853HWX2fIpmRnERl6sQ6DY+aEio990ipeSF8v3zk aVruh+/cGbnaPKL0GAwOMkU/VODHMOdTgNIP/GlRPVV1gxTgAO8FrocN+U6J1xns/vbkGOiBOg++ UuA2bXVEMx6gKIhINt9EFHpyQ6SLi730QOe9cLk5eyT0IHTCsvr3XCCD11PEvK/Enfn3Esw60mlh bsA6e3n/Jga7QgWBRCANmiZM6pua/efp/IBKUvSr8y/l8SFqdJyAGjYgNxycRr9dhn2zHVykRAT4 6nqN7viK0D0k0AnKUzqdOD/D9lnGsgCVzLQ12ilERUe/Wd8TIJKWTU8uhIlgjMZt16mHiG0j00zi 4E64yuW/AFAVLuJAKnmXWexBshEwRdtIiWVgcktRbvftMs5nkMLX4Ytl7Ka+aUEUjOiiQMMyd0G0 73zSCc2Myk/VUnrebpco+TsiiuECTyMhuMeQgiQWvIv7lbPLvDXjzctMn8+ReS8JnTP9kIEZ/f1q TWyhmC5QY5fK32Kc4DGaS1Yb7x6wTP2H3hS3pntcomLwgcR184IIzqPvGBOtHp6x/y8TI1UsGAZG ykGlBUbaB7pUXB+xfGB+HZXJINoKBu6k/fwUmFAFuvMVEaiNVtThsDOAEqsBA4Q0VdD42DwPwDRe 4bR7UFb9oeoq/kUvS3Mk3WxiMibEES70Zgv1QUuxVNhGOWJAOdklNdSUFE9XdsKlXV+3rQe3R0o6 bWOqnE0bANPp8hqv96m0fdFkv3KAOy8XHQ1jd8Vi+UMcyWertktrwIyOXJ/6TGZ5QC2nXWvbbyJ8 GysGEDc6mHjYv0idZSAlWANIBdzMMH2QIQfG9wtZjiIoKaVxdf0HfLen6EVbkZ X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Aug 2023 01:52:32 +0800 X-OQ-MSGID: <20230818175232.260691-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230818175232.260691-1-quinkblack@foxmail.com> References: <20230818175232.260691-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QWVARbkQCAL+ From: Zhao Zhili No functional changes. Signed-off-by: Zhao Zhili --- 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); }