RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dnn/dnn_backend_native_layer_conv2d: Avoid separate, unchecked allocations 

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 17:38:36 +01:00
parent 508d7005a0
commit d14ae74064
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/dnn/dnn_backend_native_layer_conv2d.c
View File

@ -191,7 +191,7 @@ 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())
? (av_cpu_count() + 1) : (ctx->options.conv2d_threads);
int thread_stride;
ThreadParam **thread_param;
ThreadParam *thread_param;
#else
ThreadParam thread_param = { 0 };
#endif
@ -231,22 +231,18 @@ int ff_dnn_execute_layer_conv2d(DnnOperand *operands, const int32_t *input_opera
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[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);
pthread_create(&thread_param[i]->thread, NULL, dnn_execute_layer_conv2d_thread, (void *)thread_param[i]);
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);
pthread_create(&thread_param[i].thread, NULL, dnn_execute_layer_conv2d_thread, &thread_param[i]);
}
//join threads, res gets function return
for (int i = 0; i < thread_num; i++){
pthread_join(thread_param[i]->thread, NULL);
pthread_join(thread_param[i].thread, NULL);
}
//release memory
for (int i = 0; i < thread_num; i++){
av_freep(&thread_param[i]);
}
av_freep(&thread_param);
#else
thread_param.thread_common_param = &thread_common_param;