Updated with James' review comment to cover the avctx->thread_count as well.
Signed-off-by: Chirag Lathia <clat...@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)
--
On Thu, Nov 15, 2018 at 3:00 PM James Almer <jamr...@gmail.com> wrote:
>
> On 11/15/2018 4:45 PM, Chirag Lathia wrote:
> > libvpx supports a maximum of 16 encoder threads.
> >
> > Signed-off-by: Chirag Lathia <clat...@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..dda4b96fb2 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 =
> > + avctx->thread_count ? avctx->thread_count : FFMIN(av_cpu_count(),
> > 16);
> > enccfg.g_lag_in_frames= ctx->lag_in_frames;
>
> The FFMIN should also cover the case where the value is set to
> avctx->thread_count, as it may also be > 16.
>
> See the libvpx decoder wrapper.
>
> >
> > if (avctx->flags & AV_CODEC_FLAG_PASS1)
> > --
> >
> >
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
From bf8750426bf84d972264fb430bf8f56f0b7eca43 Mon Sep 17 00:00:00 2001
From: Chirag Lathia <clat...@google.com>
Date: Thu, 15 Nov 2018 10:51:32 -0800
Subject: [PATCH] Add a maximum constraint of 16 encoder threads.
Signed-off-by: Chirag Lathia <clat...@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)
--
2.19.1.1215.g8438c0b245-goog
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
