[FFmpeg-devel] [Ffmpeg-devel] [PATCH] Add a maximum constraint of 16 encoder threads.

[James Almer]

On 11/15/2018 9:21 PM, Chirag Lathia wrote:
> Updated with James' review comment to cover the avctx->thread_count as well.
> 
> Signed-off-by: Chirag Lathia <clathia at google.com>
> ---
>  libavcodec/libvpxenc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
> index ad440a9c21..da9b9c6d46 100644
> --- a/libavcodec/libvpxenc.c
> +++ b/libavcodec/libvpxenc.c
> @@ -497,7 +497,8 @@ static av_cold int vpx_init(AVCodecContext *avctx,
>      enccfg.g_h            = avctx->height;
>      enccfg.g_timebase.num = avctx->time_base.num;
>      enccfg.g_timebase.den = avctx->time_base.den;
> -    enccfg.g_threads      = avctx->thread_count ? avctx->thread_count
> : av_cpu_count();
> +    enccfg.g_threads      =
> +        FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 16);
>      enccfg.g_lag_in_frames= ctx->lag_in_frames;
> 
>      if (avctx->flags & AV_CODEC_FLAG_PASS1)

Applied, thanks.