From patchwork Mon Jan 18 12:52:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 25012 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 0913C4498EA for ; Mon, 18 Jan 2021 14:54:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E626868818E; Mon, 18 Jan 2021 14:54:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BF9D688188 for ; Mon, 18 Jan 2021 14:54:33 +0200 (EET) IronPort-SDR: +rybAA2cFwfjR9J19Vmdq6eS7sKDoNWmmm/0QqbfQ+grO4Tq266No/j12FXcV5umPZV+NRowmZ qFRuQb5Hd2Sg== X-IronPort-AV: E=McAfee;i="6000,8403,9867"; a="240340626" X-IronPort-AV: E=Sophos;i="5.79,356,1602572400"; d="scan'208";a="240340626" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2021 04:54:28 -0800 IronPort-SDR: PqyPdHJ56/lYkn104CKkyOkT1fTfZiucCkOtQ/WnPUzxdUm3thmdTvdAUdjCamPhtwUBsBfJnE NdaJoVB4y+0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,356,1602572400"; d="scan'208";a="573273984" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga005.fm.intel.com with ESMTP; 18 Jan 2021 04:54:27 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jan 2021 20:52:40 +0800 Message-Id: <20210118125240.27522-1-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 6/6] dnn_backend_native_layer_conv2d.c: refine code with av_malloc_array and av_freep 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" Signed-off-by: Guo, Yejun --- .../dnn/dnn_backend_native_layer_conv2d.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c index 7c6d96e916..9dc50b7cbe 100644 --- a/libavfilter/dnn/dnn_backend_native_layer_conv2d.c +++ b/libavfilter/dnn/dnn_backend_native_layer_conv2d.c @@ -70,7 +70,7 @@ int dnn_load_layer_conv2d(Layer *layer, AVIOContext *model_file_context, int fil return 0; } - conv_params->kernel = av_malloc(kernel_size * sizeof(float)); + conv_params->kernel = av_malloc_array(kernel_size, sizeof(*conv_params->kernel)); if (!conv_params->kernel) { av_freep(&conv_params); return 0; @@ -81,7 +81,7 @@ int dnn_load_layer_conv2d(Layer *layer, AVIOContext *model_file_context, int fil conv_params->biases = NULL; if (conv_params->has_bias) { - conv_params->biases = av_malloc(conv_params->output_num * sizeof(float)); + conv_params->biases = av_malloc_array(conv_params->output_num, sizeof(*conv_params->biases)); if (!conv_params->biases){ av_freep(&conv_params->kernel); av_freep(&conv_params); @@ -187,10 +187,10 @@ int dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_operand_ int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count()) ? (av_cpu_count() + 1) : (ctx->options.conv2d_threads); #if HAVE_PTHREAD_CANCEL - pthread_t *thread_id = av_malloc(thread_num * sizeof(pthread_t)); + pthread_t *thread_id = av_malloc_array(thread_num, sizeof(*thread_id)); int thread_stride; #endif - ThreadParam **thread_param = av_malloc(thread_num * sizeof(*thread_param)); + ThreadParam **thread_param = av_malloc_array(thread_num, sizeof(*thread_param)); ThreadCommonParam thread_common_param; const ConvolutionalParams *conv_params = (const ConvolutionalParams *)(parameters); int height = operands[input_operand_indexes[0]].dims[1]; @@ -224,7 +224,7 @@ int dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_operand_ thread_stride = (height - pad_size * 2) / thread_num; //create threads for (int i = 0; i < thread_num; i++){ - thread_param[i] = av_malloc(sizeof(**thread_param)); + thread_param[i] = av_malloc(sizeof(*thread_param[0])); thread_param[i]->thread_common_param = &thread_common_param; thread_param[i]->thread_start = thread_stride * i + pad_size; thread_param[i]->thread_end = (i == thread_num - 1) ? (height - pad_size) : (thread_param[i]->thread_start + thread_stride); @@ -237,20 +237,20 @@ int dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_operand_ } //release memory - av_free(thread_id); + av_freep(&thread_id); for (int i = 0; i < thread_num; i++){ - av_free(thread_param[i]); + av_freep(&thread_param[i]); } #else - thread_param[0] = av_malloc(sizeof(**thread_param)); + thread_param[0] = av_malloc(sizeof(*thread_param[0])); thread_param[0]->thread_common_param = &thread_common_param; thread_param[0]->thread_start = pad_size; thread_param[0]->thread_end = height - pad_size; dnn_execute_layer_conv2d_thread((void *)thread_param[0]); - av_free(thread_param[0]); + av_freep(&thread_param[0]); #endif - av_free(thread_param); + av_freep(&thread_param); return DNN_SUCCESS; }