diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 22:24:29 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 22:25:53 +0400 |
commit | 42bb3e4db672ebb6d8b86e869602a02dcae0f4ca (patch) | |
tree | 64e6819464ec5074f847e674662f9b44fb8a197a /libavcodec/pthread.c | |
parent | 0cbfbdef4a0701c162569808b8a50ff462e788d8 (diff) |
avcodec: remove ff_get_logical_cpus()
This simplifies the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r-- | libavcodec/pthread.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 41d6d624fc..2433880323 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -146,15 +146,6 @@ typedef struct FrameThreadContext { * limit the number of threads to 16 for automatic detection */ #define MAX_AUTO_THREADS 16 -int ff_get_logical_cpus(AVCodecContext *avctx) -{ - int nb_cpus = av_cpu_count(); - if (avctx->height) - nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16); - - return nb_cpus; -} - static void* attribute_align_arg worker(void *v) { AVCodecContext *avctx = v; @@ -265,7 +256,9 @@ static int thread_init(AVCodecContext *avctx) int thread_count = avctx->thread_count; if (!thread_count) { - int nb_cpus = ff_get_logical_cpus(avctx); + int nb_cpus = av_cpu_count(); + if (avctx->height) + nb_cpus = FFMIN(nb_cpus, (avctx->height+15)/16); // use number of cores + 1 as thread count if there is more than one if (nb_cpus > 1) thread_count = avctx->thread_count = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS); |