diff options
author | Paul Wilkins <paulwilkins@google.com> | 2012-02-10 16:02:10 +0000 |
---|---|---|
committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-10 16:23:59 +0000 |
commit | 2615ca5d41388216ec65db9d9cb0f719efef855a (patch) | |
tree | 717edcd9962e9d4170b8747208c76f57d6bf0e66 /vp8/common/generic | |
parent | f64725a0097819edf124fc15d300c77b2b42f744 (diff) | |
download | libvpx-2615ca5d41388216ec65db9d9cb0f719efef855a.tar libvpx-2615ca5d41388216ec65db9d9cb0f719efef855a.tar.gz libvpx-2615ca5d41388216ec65db9d9cb0f719efef855a.tar.bz2 libvpx-2615ca5d41388216ec65db9d9cb0f719efef855a.zip |
Removal of threading code.
For the experimental branch we are trying to slim the codebase
down removing features such as threading for now which complicate
the process of development and testing.
Change-Id: I657c0246aef4d1fa8c8ffc6a1adfeee45bce8e24
Diffstat (limited to 'vp8/common/generic')
-rw-r--r-- | vp8/common/generic/systemdependent.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c index 22d249b89..fcee14c41 100644 --- a/vp8/common/generic/systemdependent.c +++ b/vp8/common/generic/systemdependent.c @@ -17,54 +17,9 @@ #include "vp8/common/idct.h" #include "vp8/common/onyxc_int.h" -#if CONFIG_MULTITHREAD -#if HAVE_UNISTD_H -#include <unistd.h> -#elif defined(_WIN32) -#include <windows.h> -typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); -#endif -#endif - extern void vp8_arch_x86_common_init(VP8_COMMON *ctx); extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); -#if CONFIG_MULTITHREAD -static int get_cpu_count() -{ - int core_count = 16; - -#if HAVE_UNISTD_H -#if defined(_SC_NPROCESSORS_ONLN) - core_count = sysconf(_SC_NPROCESSORS_ONLN); -#elif defined(_SC_NPROC_ONLN) - core_count = sysconf(_SC_NPROC_ONLN); -#endif -#elif defined(_WIN32) - { - PGNSI pGNSI; - SYSTEM_INFO sysinfo; - - /* Call GetNativeSystemInfo if supported or - * GetSystemInfo otherwise. */ - - pGNSI = (PGNSI) GetProcAddress( - GetModuleHandle(TEXT("kernel32.dll")), "GetNativeSystemInfo"); - if (pGNSI != NULL) - pGNSI(&sysinfo); - else - GetSystemInfo(&sysinfo); - - core_count = sysinfo.dwNumberOfProcessors; - } -#else - /* other platforms */ -#endif - - return core_count > 0 ? core_count : 1; -} -#endif - void vp8_machine_specific_config(VP8_COMMON *ctx) { #if CONFIG_RUNTIME_CPU_DETECT @@ -156,7 +111,4 @@ void vp8_machine_specific_config(VP8_COMMON *ctx) rtcd->idct.iwalsh1 = vp8_short_inv_walsh4x4_1_c; rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_c; -#if CONFIG_MULTITHREAD - ctx->processor_core_count = get_cpu_count(); -#endif /* CONFIG_MULTITHREAD */ } |