From patchwork Fri Aug 18 17:52:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2552108pzb; Fri, 18 Aug 2023 03:01:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPoTIX0XWOmjc8oOvYBsPu1S1gxyyXu15gzOCcfGXub3cViLQUMxQFN18c/q3dyn5BE6sR X-Received: by 2002:a05:6402:60f:b0:523:b665:e494 with SMTP id n15-20020a056402060f00b00523b665e494mr1658851edv.15.1692352896050; Fri, 18 Aug 2023 03:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692352896; cv=none; d=google.com; s=arc-20160816; b=heZqP/KZ5RRksbzWEPpGZBamipM/5CaxHq8aZuft3Bjbm9ANeckEtX63KZkqb1wdSB yNP18D4zZMXwcaerDzC6DxLR1iSRmqlLiBa5cOFI7t8vSfopUHzgJ0rzNla0xjY/lIXu 7Ctg7NBoQ0D+lLHkueG+fsEPHM7a4W8gBNjLMlmQi5BEivfz3vOR+/ZXRmRmIj8MDKEw KxBfNcBwdpZiCdkbYE4CKlwgNc8qQ66HeOYZIPbKFrar34KbYlKZ32J6bvWFF0Yz3bY8 kPMQnJoRf4wkTERE6TRPLQFVgscexpA7bZE0LGrbRhPcPbwZTREFXY895lNVlZ1pMHlD 1Vfw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=vAm/l2T1SE6U3jzz0m7lehmO75JqSvM++xlO3Yu8zsw=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=g/Pgp+SW0oTFYmWfwCxtcnqdQwQLQ4mAs/QHSzypUlkLP+3BNJ+91nhKzT723bh0wu p2ohgnVOkRAXGQ1Yea2KSOEGdY5J0Q3IJv/Rv7ftijvsF/vYCm+G2jY3m6u0xjWKvQ8/ TCvBPUJ39o8by9e2O/x78R5917IRq7HzXPGQI4yCf0aX2ZYOE/V/MxkgQRPb143ebqa6 2ST7Xo90hALgBIcybIrGkYRrBIBlWgXMkmkw9gChZl2L9VhwIpzqqp4t0syADTLx2SJ1 XNzN06MnTrbfnQ7wHwRX1ggDtbH1apQh2uBKB/H4JeZhq4S2Hxw3KtihfNe5zPXiS7Bm V47g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=c5VWPe8k; 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 k19-20020aa7d8d3000000b005232cea0d77si1106053eds.343.2023.08.18.03.01.35; Fri, 18 Aug 2023 03:01:36 -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=c5VWPe8k; 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 A7D2D68C654; Fri, 18 Aug 2023 13:01:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from xmbg9.mail.qq.com (xmbg9.mail.qq.com [81.69.217.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B12C568C416 for ; Fri, 18 Aug 2023 13:01:25 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1692352880; bh=i5D78TLScWUrk2XW1z6Teqz+ZYli535USB5L8iasxyw=; h=From:To:Cc:Subject:Date; b=c5VWPe8k6wn05AcVGQB719bLt5UFw8iU815GowCaWa61BSTGo8tkczJTsKBGP8SaP ufyOvhqhyxrHdGn2c7CxQOxng7Hqf9UbUwU980t5e/KyzAynX37GPK0LKSZNy+QY1Z 83SOoEKM1inxi8QY6bZ7jQ7YCS4bAzQbDW5SuZeA= 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: xmsmtpt1692352352t8zrzi7sv Message-ID: X-QQ-XMAILINFO: MAcVqULX7QQ1UGv+wPP4z0JCVzthlWGbpMdANUFALxFPbS3o0F/lh4oMeyU1V7 oT5HVC91LomHiapyKAA7Z7FQTECmPcFJCjtfg3pMWeSzJyLyrWDJZPz86bRWdsXmdTLTkdBRPM9N FpI+JwAOXuti2HSQ+4Hz0zuCT49PWRLirypa5PCcRXnE8jHFIwhhDY4fzBKYaMXV7ZvOElfcUIDI 7UF80TRnqrPbg1yrTFJdLiS5S3vuvQEVa90RDyBXhMObOh83OVuuFGDxcBdWKwsujTo/GUXdnIl5 OqaZnLY49syiyM8qpI5W/MfpERixfAdq4TEkjp4WuMRwX3osDzdabJqkCf+A1ANOIWoVQ3ZDWRhB /fhuBE06QavyhIZq7xlGNSUZ552vvypIvP20PniBAdBSD9I6/ObhD8B4nwvZCf3PqqaRMsnx97i3 TEVu7fuSomwmabNFkcUXLSiNp6keKEu17Gevemyuf5J4TdS7Nxqvtvt8v4zjmJ9lnWxwBkZ3Kuju b1WztE6bO+09gyJCn605qINt9CAvdpMJ1VDKJP2V4vIaJc+CPLzhk63BrRhcWFYqDTxFS5v2h45q WxwQo27MUivWT53tSGQBoFKIYZdRmMsxxrRsJBS4XBMaSLnXzzWiYQrlZd5LXYVILAbZwrq+oBzL R5uGkRqrmm1/ayl6AVOmKj5Nk14qLytzHz/R4FOZ6plYWvEfvxVOKQMx7qXZdhcm3SKVWktLwwf3 KDswXUS64X5kIx/COqbtFFU7/kw/PRrnqX4OWFRGAwfq8AY922Yzh63Kvy+hXHs49X8590v2TOHZ j2bVZeRMdtr8c+PE4GsYrfdcNXrOVDmyXADGU6cNkdIXwL3h744tqge9BKkADBtXuXVQSQvROJmE sgg+2j1EAbXQ6VVwmxFa+AIv5aiy6n5Sl4J8/jTXzfvRxIrNMp4sd/HM4k7VMPcFcufOdUCY2bWX pk1vulMoA07ZRBxKhMlDNo14XTtADDa0bA/VWIi1hqmmtiTEq6qA== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Aug 2023 01:52:30 +0800 X-OQ-MSGID: <20230818175232.260691-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/dnn_filter_common: fix memleak 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: 3NW3+8PtTPt0 From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn_filter_common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/dnn_filter_common.c b/libavfilter/dnn_filter_common.c index d175c91914..3b9182c1d1 100644 --- a/libavfilter/dnn_filter_common.c +++ b/libavfilter/dnn_filter_common.c @@ -159,4 +159,10 @@ void ff_dnn_uninit(DnnContext *ctx) if (ctx->dnn_module) { (ctx->dnn_module->free_model)(&ctx->model); } + if (ctx->model_outputnames) { + for (int i = 0; i < ctx->nb_outputs; i++) + av_free(ctx->model_outputnames[i]); + + av_freep(&ctx->model_outputnames); + } } From patchwork Fri Aug 18 17:52:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 43254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2548130pzb; Fri, 18 Aug 2023 02:53:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaOUZDC8KmiJr6jgViKLh0qUaOnb77f54ETslcrPb+rGb4jjMakcQcPHYvgyJ7k0gtZNgr X-Received: by 2002:aa7:c151:0:b0:523:372c:24fe with SMTP id r17-20020aa7c151000000b00523372c24femr1667136edp.39.1692352384221; Fri, 18 Aug 2023 02:53:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692352384; cv=none; d=google.com; s=arc-20160816; b=rT+h4+QyJuRjDKIl67J+eWFw7piaPbdn7qnrsVBCqn2PQbImzXpPFePId31kTAsMK3 25JRHdSmblvxMLWdBWf/30UmwmrsseVcJk3RUljDj7xGBprPzU5Gvo7T4X5Ib7YoamdG AEuaGC4ebMDDnTGJIKgnGXklGKIeQ5s/u9oQks9cidpeDg3SlOEvAWJQYqGA0VcEjEEs F6SODYAp8I4wV7W0yGlPiP66QA5kBboebkqOLFPq79tuioPKd8xYEIoLQmEhLinMY3yi z0kLwH8neC2nAVAwFSu8OqWf2B68nDsk8McuozCuYNYy+3J9ojLtnqMXsa0nFHNHcW2B VwaQ== 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=6Iyyh5ab9rJW/hb2pDmFkoU2YcpRYyofXyJ4tvw+X50=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=gEf50GSvgqNstjvquXb0VjxmRHMzMkmvKG1qt/kXY3t0XFfpcKRFf/UCGRYM6rDCL/ 0wPjGE1yb1+Dy62mIYLUCHsrW6FI2TEzqipFtwiFUuJt1lA1eZqr3wI1E0j1RqNQyCdv 7DWRahAPmw/g/qmJqOhCqtAE4RZUy8Z/79UnKkOZmYlz/XSv1xqaZ4NRRSx9IA0Eufnp 7JRebxo+y7dpnQ04aQxOE/S0Vdc27NdWXcmusSoIIpllOmz98v7lOFe3XgOq5RKV1ZoN 58/lSysTDMAnMkfFRDvTLZRE8zaApl7eXqL9dC0oiAF63uAwGc3MElpPmY/eG3ioR2Ta gLlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=j70RfMEj; 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 x12-20020aa7d38c000000b0052563914cc5si1133075edq.508.2023.08.18.02.53.00; Fri, 18 Aug 2023 02:53:04 -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=j70RfMEj; 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 EC1C268C68A; Fri, 18 Aug 2023 12:52:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01B5068C642 for ; Fri, 18 Aug 2023 12:52:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1692352354; bh=TUScR1kybHohHxOyHXwfpc+rRgK1Ut7NwEHHsF+SCfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j70RfMEj0kDxgsfW1j5lRe+NYmzO2TF6CrHC6BGmqC/MPPtoYJK191KPifyAsSRJZ nttXJUaKqYKVXGpDP/Y2d0bEnHkVceC7t3SA7Usb9B4EeL1c7vT16Y0hFR/0KdWgHo RQ8UzG9N/UMo/Evbp46LihwE8QfzbAC89hfVNW3I= 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: xmsmtpt1692352353t0zymjhlw Message-ID: X-QQ-XMAILINFO: MB5+LsFw85No6PB52Z1ci/cHOetl2P87eP+iwN9TL3PaPH3tO8R4Ng4+I6Dbzs owoJzQAKpJRmHztOKyOJf5ndk1JI3I0bP2b2r8N/1+QDCQq0k1b3t2CIiEGWzUfrpJn6QYiORKOw UI0Wtl85G9p25PX7kNZT72dyjjiaQZIpFEMXuDvig2O8JIojojgzCP9SSxqV73ZP4e+TVkOdHGwy ddd0FE2EDIWSOsqZhT0TSapR+fd2TBqUmrG1tMY1z1pm6a9Zg4QoswkLs/N560Kd4cb3vMh5QrdC lm9pWwnQLUCYnE3HmvwqiDwhbNtcYk1WwUEwZ4M5NDI6+BMlppE+8c4DBKSth4IJhLGgO53DvLbW /kjjOkHhFYUJShJMXEcJFrRJhq9H5YYrkUAf74CCevwjT8cvOQrWkEfbH+HdI8Nb8wuzuTyrN8RN CpzaQAGO0bvpr1LxHciSQbB5+MYCe1PKy3tRm/xW18hNBMSJMbG8jwrh7gTvS881ntM09aMzS00k 6u2RsjQjIxcYJTeUc/JrgoYrFO/rExivayaYl8TFzXwxHy16Np+Omh8YNXjNSgVj1M7OqgJJ/NXT Zk78XQKLLetO9AIHQ5+eeGlHgsiFGH9ZV2bQGvqnZm8k6HB35Mp9EpiKI9x45j/OsoZ2W+Chea3B 1RaO+wxSxgyHYYYCOXK1YQH5eqEM/cLOLpemBf5XIYYGpK1zekpAGhEd/PR5savrg/FYXdembIXn ZzkHAI45W1IK5A8evIfCaj3hjuiqmX7aCXpVmBPSC2F5I+rsRq9Y1Ft4jpb0wCpvX3MeyLfRPfhF ef8PQn4+AGKglyvc74Zi36ygoQs5UCFDI5WoXW4ZjNiSqYjvxA3y8Hz71U7Z2ohlOgmyF7Iu10QE kXzcjimAz+rR/7/S8Zvn29GrtAa+k3lvrogM3+NnQXJvIjAWOJkHh/LKZ1mwwTEVepMGuOSqDNPi tswWbqiTmr4K2OKsu4tywrfxrtzVSH+FT9lgHTkfpwwZi+pu15qV/XH7bz/8V9 X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Aug 2023 01:52:31 +0800 X-OQ-MSGID: <20230818175232.260691-2-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 2/3] avfilter/dnn_backend_openvino: fix multiple memleaks 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: AAm/bDyCfgon From: Zhao Zhili Signed-off-by: Zhao Zhili --- 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; 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); }