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

Side by Side Diff: source/libvpx/vpx_ports/x86_cpuid.c

Issue 111463005: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vpx_ports/x86.h ('k') | source/libvpx/vpx_scale/generic/yv12config.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
(...skipping 20 matching lines...) Expand all
31 { "UMC UMC UMC ", VPX_CPU_UMC }, 31 { "UMC UMC UMC ", VPX_CPU_UMC },
32 { "VIA VIA VIA ", VPX_CPU_VIA }, 32 { "VIA VIA VIA ", VPX_CPU_VIA },
33 }; 33 };
34 34
35 vpx_cpu_t vpx_x86_vendor(void) { 35 vpx_cpu_t vpx_x86_vendor(void) {
36 unsigned int reg_eax; 36 unsigned int reg_eax;
37 unsigned int vs[3]; 37 unsigned int vs[3];
38 int i; 38 int i;
39 39
40 /* Get the Vendor String from the CPU */ 40 /* Get the Vendor String from the CPU */
41 cpuid(0, reg_eax, vs[0], vs[2], vs[1]); 41 cpuid(0, 0, reg_eax, vs[0], vs[2], vs[1]);
42 42
43 for (i = 0; i < VPX_CPU_LAST; i++) { 43 for (i = 0; i < VPX_CPU_LAST; i++) {
44 if (strncmp((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0) 44 if (strncmp((const char *)vs, cpuid_vendor_list[i].vendor_string, 12) == 0)
45 return (cpuid_vendor_list[i].vendor_id); 45 return (cpuid_vendor_list[i].vendor_id);
46 } 46 }
47 47
48 return VPX_CPU_UNKNOWN; 48 return VPX_CPU_UNKNOWN;
49 } 49 }
OLDNEW
« no previous file with comments | « source/libvpx/vpx_ports/x86.h ('k') | source/libvpx/vpx_scale/generic/yv12config.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698