From patchwork Sat Mar 13 06:28:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26375 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 87B8544B263 for ; Sat, 13 Mar 2021 08:40:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 657E968AC21; Sat, 13 Mar 2021 08:40:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94B1168AC04 for ; Sat, 13 Mar 2021 08:40:02 +0200 (EET) IronPort-SDR: ozf5UfBeqVZnL7ac0YNPS0yRbxFEeIvAiBhHYb/62htU6k7VKMeCH3YhNJFMPcMGHvXqmLOyUx RLFWINez6x1w== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195468" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195468" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:52 -0800 IronPort-SDR: RFN8MN5T5qYsxEwNE/+2YqV9yYICo0uymqKSM1QDvulZp9LFEpKoi83LrGzDTeKS6uicbcuvXF DiiLa+dC5vVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197273" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:51 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:51 +0800 Message-Id: <20210313062855.27212-1-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] lavfi/dnn_backend_openvino.c: fix mem leak for AVFrame upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/dnn/dnn_backend_openvino.c | 30 ++++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 5be053b7f8..d86fb124d5 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -485,25 +485,12 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu OVContext *ctx = &ov_model->ctx; TaskItem task; RequestItem request; - AVFrame *in_frame = av_frame_alloc(); + AVFrame *in_frame = NULL; AVFrame *out_frame = NULL; TaskItem *ptask = &task; IEStatusCode status; input_shapes_t input_shapes; - if (!in_frame) { - av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for input frame\n"); - return DNN_ERROR; - } - out_frame = av_frame_alloc(); - if (!out_frame) { - av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for output frame\n"); - av_frame_free(&in_frame); - return DNN_ERROR; - } - in_frame->width = input_width; - in_frame->height = input_height; - if (ctx->options.input_resizable) { status = ie_network_get_input_shapes(ov_model->network, &input_shapes); input_shapes.shapes->shape.dims[2] = input_height; @@ -523,6 +510,21 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu } } + in_frame = av_frame_alloc(); + if (!in_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for input frame\n"); + return DNN_ERROR; + } + in_frame->width = input_width; + in_frame->height = input_height; + + out_frame = av_frame_alloc(); + if (!out_frame) { + av_log(ctx, AV_LOG_ERROR, "Failed to allocate memory for output frame\n"); + av_frame_free(&in_frame); + return DNN_ERROR; + } + task.done = 0; task.do_ioproc = 0; task.async = 0; From patchwork Sat Mar 13 06:28:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26374 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0EAEE44B263 for ; Sat, 13 Mar 2021 08:40:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E303D68ABF9; Sat, 13 Mar 2021 08:40:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A56A468A995 for ; Sat, 13 Mar 2021 08:39:56 +0200 (EET) IronPort-SDR: bLW6Je2f5WrQp1KRk8K2kJ939OuyR6gjoPs1F9lZoPsI21Kkp+Ol8VLIH5mdkmvuohJzCD9DKW 4EdjVuKuW9Hg== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195469" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195469" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:53 -0800 IronPort-SDR: hsuvpJoFDlOUyVcQtet27y96h/keCPS39UEiC2piW9fWh3uDVf4UtmhTUxfUYJdiwvRppa/WOB t8Vxlsjc1kKA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197278" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:52 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:52 +0800 Message-Id: <20210313062855.27212-2-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313062855.27212-1-yejun.guo@intel.com> References: <20210313062855.27212-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 2/5] lavfi/dnn_backend_openvino.c: fix mem leak for input_blob and output_blob upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/dnn/dnn_backend_openvino.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index d86fb124d5..df1631e86e 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -141,12 +141,14 @@ static DNNReturnType fill_model_input_ov(OVModel *ov_model, RequestItem *request status |= ie_blob_get_dims(input_blob, &dims); status |= ie_blob_get_precision(input_blob, &precision); if (status != OK) { + ie_blob_free(&input_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get input blob dims/precision\n"); return DNN_ERROR; } status = ie_blob_get_buffer(input_blob, &blob_buffer); if (status != OK) { + ie_blob_free(&input_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get input blob buffer\n"); return DNN_ERROR; } @@ -211,6 +213,7 @@ static void infer_completion_callback(void *args) status = ie_blob_get_buffer(output_blob, &blob_buffer); if (status != OK) { + ie_blob_free(&output_blob); av_log(ctx, AV_LOG_ERROR, "Failed to access output memory\n"); return; } @@ -218,6 +221,7 @@ static void infer_completion_callback(void *args) status |= ie_blob_get_dims(output_blob, &dims); status |= ie_blob_get_precision(output_blob, &precision); if (status != OK) { + ie_blob_free(&output_blob); av_log(ctx, AV_LOG_ERROR, "Failed to get dims or precision of output\n"); return; } From patchwork Sat Mar 13 06:28:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26376 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B94CC44B263 for ; Sat, 13 Mar 2021 08:40:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A6BC68AC26; Sat, 13 Mar 2021 08:40:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF48968AC04 for ; Sat, 13 Mar 2021 08:40:03 +0200 (EET) IronPort-SDR: jMb1W/RbLKDKoz2Ns70+eeWoB++j2Vl7E0TZU5VwlQHu9urZgGwk3i2ahkWphJkblQFpfbIhJ8 NCF6TTLGAsAQ== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195470" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195470" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:54 -0800 IronPort-SDR: AB2uvyK7z+ynMDU1BNNRmQhugiHiThCTYyKPLfzZrU2G7CyBkMcz7kEx2ZDK7REPHJB/0xOUrw Can5LdhpnM8w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197284" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:53 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:53 +0800 Message-Id: <20210313062855.27212-3-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313062855.27212-1-yejun.guo@intel.com> References: <20210313062855.27212-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 3/5] lavfi/dnn_backend_openvino.c: fix typo upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/dnn/dnn_backend_openvino.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index df1631e86e..50de6a996e 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -311,7 +311,7 @@ static DNNReturnType init_model_ov(OVModel *ov_model, const char *input_name, co status = ie_network_set_input_precision(ov_model->network, input_name, U8); if (status != OK) { av_log(ctx, AV_LOG_ERROR, "Failed to set input precision as U8 for %s\n", input_name); - return DNN_ERROR; + goto err; } } From patchwork Sat Mar 13 06:28:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26377 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 166C344B263 for ; Sat, 13 Mar 2021 08:40:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1AE568AC2D; Sat, 13 Mar 2021 08:40:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89FFA688288 for ; Sat, 13 Mar 2021 08:40:08 +0200 (EET) IronPort-SDR: XNv2fTRy1apmxAW6J0IezKbIyh2qrLopYKw0Te7pqn7m7oyg70DTXMXpFXkEVGWag5HPA47AVm 14mJVZn6vnGg== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195471" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195471" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:55 -0800 IronPort-SDR: cjCqC3tSQmhLYw+IKob3Kprtm76KOiukS9TaIadjJDWdcnDTGT3tT7ZbYtzDbJ+MfjawahIMQ0 4wDtcaA38eZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197288" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:54 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:54 +0800 Message-Id: <20210313062855.27212-4-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313062855.27212-1-yejun.guo@intel.com> References: <20210313062855.27212-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 4/5] lavfi/dnn_backend_openvino.c: fix mem leak for RequestItem upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/dnn/dnn_backend_openvino.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 50de6a996e..55cb0c757e 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -353,25 +353,23 @@ static DNNReturnType init_model_ov(OVModel *ov_model, const char *input_name, co goto err; } + item->callback.completeCallBackFunc = infer_completion_callback; + item->callback.args = item; + if (ff_safe_queue_push_back(ov_model->request_queue, item) < 0) { + av_freep(&item); + goto err; + } + status = ie_exec_network_create_infer_request(ov_model->exe_network, &item->infer_request); if (status != OK) { - av_freep(&item); goto err; } item->tasks = av_malloc_array(ctx->options.batch_size, sizeof(*item->tasks)); if (!item->tasks) { - av_freep(&item); goto err; } item->task_count = 0; - - item->callback.completeCallBackFunc = infer_completion_callback; - item->callback.args = item; - if (ff_safe_queue_push_back(ov_model->request_queue, item) < 0) { - av_freep(&item); - goto err; - } } ov_model->task_queue = ff_queue_create(); From patchwork Sat Mar 13 06:28:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 26378 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 066D344B263 for ; Sat, 13 Mar 2021 08:40:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E11B768AC43; Sat, 13 Mar 2021 08:40:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBA88688288 for ; Sat, 13 Mar 2021 08:40:09 +0200 (EET) IronPort-SDR: kCphjz3dMwoGmyOSCloLYYJsU58luk1K2otvbP14oYwd1NnHDIUCmi6psCgSWe3zIGJTOUWoNK W9RnCcsMybFA== X-IronPort-AV: E=McAfee;i="6000,8403,9921"; a="168195472" X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="168195472" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2021 22:39:56 -0800 IronPort-SDR: rwvr9o2TN5vgXucZ8BeglSBpC9P0smiXIQ1gi5XsdZu3jXAuH+2eJ3xW4UXx0RTBra9zLkUJHJ IZqYa98ABfKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,245,1610438400"; d="scan'208";a="604197294" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 12 Mar 2021 22:39:55 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Mar 2021 14:28:55 +0800 Message-Id: <20210313062855.27212-5-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210313062855.27212-1-yejun.guo@intel.com> References: <20210313062855.27212-1-yejun.guo@intel.com> Subject: [FFmpeg-devel] [PATCH 5/5] lavfi/dnn_backend_openvino.c: fix mem leak for TaskItem upon error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/dnn/dnn_backend_openvino.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 55cb0c757e..9a47d74c15 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -678,12 +678,6 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i return DNN_ERROR; } - task = av_malloc(sizeof(*task)); - if (!task) { - av_log(ctx, AV_LOG_ERROR, "unable to alloc memory for task item.\n"); - return DNN_ERROR; - } - if (!ov_model->exe_network) { if (init_model_ov(ov_model, input_name, output_names[0]) != DNN_SUCCESS) { av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n"); @@ -691,6 +685,12 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, const char *i } } + task = av_malloc(sizeof(*task)); + if (!task) { + av_log(ctx, AV_LOG_ERROR, "unable to alloc memory for task item.\n"); + return DNN_ERROR; + } + task->done = 0; task->do_ioproc = 1; task->async = 1;