diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 23:24:53 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:07:31 +0100 |
commit | 4478e9d8db65ca827f2b3ef3ef6ee806bffdba45 (patch) | |
tree | 795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1 /libavcodec/pthread.c | |
parent | 2cba62bd84d15e84633b982f868fb1e50834c0d8 (diff) | |
parent | febd022228660cb4b4d0e7b108bfec339b7dce92 (diff) | |
download | ffmpeg-4478e9d8db65ca827f2b3ef3ef6ee806bffdba45.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for dfa
mpegaudiodec: fix seeking.
mpegaudiodec: fix compilation when testing the unchecked bitstream reader
threads: add sysconf based number of CPUs detection
threads: always include necessary headers for number of CPUs detection
threads: default to automatic thread count detection
Changelog: restore version <next> header
cook: K&R formatting cosmetics
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread.c')
-rw-r--r-- | libavcodec/pthread.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index c8c5f3f511..a338dbedef 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -34,9 +34,11 @@ #if HAVE_SCHED_GETAFFINITY #define _GNU_SOURCE #include <sched.h> -#elif HAVE_GETSYSTEMINFO +#endif +#if HAVE_GETSYSTEMINFO #include <windows.h> -#elif HAVE_SYSCTL +#endif +#if HAVE_SYSCTL #if HAVE_SYS_PARAM_H #include <sys/param.h> #endif @@ -44,6 +46,9 @@ #include <sys/param.h> #include <sys/sysctl.h> #endif +#if HAVE_SYSCONF +#include <unistd.h> +#endif #include "avcodec.h" #include "internal.h" @@ -178,6 +183,10 @@ static int get_logical_cpus(AVCodecContext *avctx) ret = sysctl(mib, 2, &nb_cpus, &len, NULL, 0); if (ret == -1) nb_cpus = 0; +#elif HAVE_SYSCONF && defined(_SC_NPROC_ONLN) + nb_cpus = sysconf(_SC_NPROC_ONLN); +#elif HAVE_SYSCONF && defined(_SC_NPROCESSORS_ONLN) + nb_cpus = sysconf(_SC_NPROCESSORS_ONLN); #endif av_log(avctx, AV_LOG_DEBUG, "detected %d logical cores\n", nb_cpus); return FFMIN(nb_cpus, MAX_AUTO_THREADS); |