highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnn/dnn_backend_native_layer_conv2d: Join two arrays, avoid allocation

Browse Source 
Fixes Coverity issue #1473507.

Reviewed-by: Guo, Yejun <yejun.guo@intel.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-10 16:21:13 +01:00
parent d915c1dd7a
commit 639b3bbbc7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/dnn/dnn_backend_native_layer_conv2d.c
View File

@@ -38,6 +38,9 @@ typedef struct ThreadCommonParam{
typedef struct ThreadParam{ typedef struct ThreadParam{
ThreadCommonParam *thread_common_param; ThreadCommonParam *thread_common_param;
int thread_start, thread_end; int thread_start, thread_end;
#if HAVE_PTHREAD_CANCEL
pthread_t thread;
#endif
} ThreadParam; } ThreadParam;
int ff_dnn_load_layer_conv2d(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num) int ff_dnn_load_layer_conv2d(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num)
@@ -187,7 +190,6 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera
int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count()) int thread_num = (ctx->options.conv2d_threads <= 0 || ctx->options.conv2d_threads > av_cpu_count())
? (av_cpu_count() + 1) : (ctx->options.conv2d_threads); ? (av_cpu_count() + 1) : (ctx->options.conv2d_threads);
#if HAVE_PTHREAD_CANCEL #if HAVE_PTHREAD_CANCEL
pthread_t *thread_id = av_malloc_array(thread_num, sizeof(*thread_id));
int thread_stride; int thread_stride;
#endif #endif
ThreadParam **thread_param = av_malloc_array(thread_num, sizeof(*thread_param)); ThreadParam **thread_param = av_malloc_array(thread_num, sizeof(*thread_param));
@@ -230,17 +232,15 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera
thread_param[i]->thread_common_param = &thread_common_param; thread_param[i]->thread_common_param = &thread_common_param;
thread_param[i]->thread_start = thread_stride * i + pad_size; 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); thread_param[i]->thread_end = (i == thread_num - 1) ? (height - pad_size) : (thread_param[i]->thread_start + thread_stride);
pthread_create(&thread_id[i], NULL, dnn_execute_layer_conv2d_thread, (void *)thread_param[i]); pthread_create(&thread_param[i]->thread, NULL, dnn_execute_layer_conv2d_thread, (void *)thread_param[i]);
} }
//join threads, res gets function return //join threads, res gets function return
for (int i = 0; i < thread_num; i++){ for (int i = 0; i < thread_num; i++){
pthread_join(thread_id[i], NULL); pthread_join(thread_param[i]->thread, NULL);
} }
//release memory //release memory
av_freep(&thread_id);
for (int i = 0; i < thread_num; i++){ for (int i = 0; i < thread_num; i++){
av_freep(&thread_param[i]); av_freep(&thread_param[i]);
} }