From d8754de7c31bc2ec775a73001132862e007f4c9a Mon Sep 17 00:00:00 2001 From: Peter Fog Date: Mon, 15 Feb 2021 11:49:19 +0100 Subject: FFmpeg: Improve multi-threading settings for VSE proxies Following code from D8627 this patch corrects multi threaded processing of proxies, where a 60 sec proxy generation drops to 35 sec. Differential Revision: https://developer.blender.org/D8659 --- source/blender/imbuf/intern/indexer.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source') diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 20e1febedd7..f10e3b31141 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -40,6 +40,8 @@ #include "BKE_global.h" +# include "BLI_threads.h" + #ifdef WITH_AVI # include "AVI_avi.h" #endif @@ -495,6 +497,8 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( rv->st->id = 0; rv->c = rv->st->codec; + rv->c->thread_count = BLI_system_thread_count(); + rv->c->thread_type = FF_THREAD_SLICE; rv->c->codec_type = AVMEDIA_TYPE_VIDEO; rv->c->codec_id = AV_CODEC_ID_MJPEG; rv->c->width = width; -- cgit v1.2.3