Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Side by Side Diff: source/libvpx/vp8/common/generic/systemdependent.c

Issue 1162573005: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/libvpx/vp8/common/filter.c ('k') | source/libvpx/vp8/common/idctllm.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 11
12 #include "vpx_config.h" 12 #include "vpx_config.h"
13 #include "vp8_rtcd.h" 13 #include "vp8_rtcd.h"
14 #if ARCH_ARM 14 #if ARCH_ARM
15 #include "vpx_ports/arm.h" 15 #include "vpx_ports/arm.h"
16 #elif ARCH_X86 || ARCH_X86_64 16 #elif ARCH_X86 || ARCH_X86_64
17 #include "vpx_ports/x86.h" 17 #include "vpx_ports/x86.h"
18 #endif 18 #endif
19 #include "vp8/common/onyxc_int.h" 19 #include "vp8/common/onyxc_int.h"
20 #include "vp8/common/systemdependent.h"
20 21
21 #if CONFIG_MULTITHREAD 22 #if CONFIG_MULTITHREAD
22 #if HAVE_UNISTD_H && !defined(__OS2__) 23 #if HAVE_UNISTD_H && !defined(__OS2__)
23 #include <unistd.h> 24 #include <unistd.h>
24 #elif defined(_WIN32) 25 #elif defined(_WIN32)
25 #include <windows.h> 26 #include <windows.h>
26 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); 27 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
27 #elif defined(__OS2__) 28 #elif defined(__OS2__)
28 #define INCL_DOS 29 #define INCL_DOS
29 #define INCL_DOSSPINLOCK 30 #define INCL_DOSSPINLOCK
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #if CONFIG_MULTITHREAD 90 #if CONFIG_MULTITHREAD
90 ctx->processor_core_count = get_cpu_count(); 91 ctx->processor_core_count = get_cpu_count();
91 #endif /* CONFIG_MULTITHREAD */ 92 #endif /* CONFIG_MULTITHREAD */
92 93
93 #if ARCH_ARM 94 #if ARCH_ARM
94 ctx->cpu_caps = arm_cpu_caps(); 95 ctx->cpu_caps = arm_cpu_caps();
95 #elif ARCH_X86 || ARCH_X86_64 96 #elif ARCH_X86 || ARCH_X86_64
96 ctx->cpu_caps = x86_simd_caps(); 97 ctx->cpu_caps = x86_simd_caps();
97 #endif 98 #endif
98 } 99 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/common/filter.c ('k') | source/libvpx/vp8/common/idctllm.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698