diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 08:29:32 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 08:29:32 +0000 |
| commit | 55508c4b3b949c1ead26e59e5685d94d16131da0 (patch) | |
| tree | 4b59d54c592ee34e7d8ae141c8875b7be79b3847 /remoting | |
| parent | 993402c92ba6629ebe4bec234e1bbf2a100b9867 (diff) | |
| download | chromium_src-55508c4b3b949c1ead26e59e5685d94d16131da0.zip chromium_src-55508c4b3b949c1ead26e59e5685d94d16131da0.tar.gz chromium_src-55508c4b3b949c1ead26e59e5685d94d16131da0.tar.bz2 | |
Remove duplicate CPU detection code; use base::CPU instead.
BUG=none
TEST=media_unittests.
Review URL: https://chromiumcodereview.appspot.com/10537082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/differ_block.cc | 9 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/remoting/host/differ_block.cc b/remoting/host/differ_block.cc index a8da5b9..3e0b12c 100644 --- a/remoting/host/differ_block.cc +++ b/remoting/host/differ_block.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "remoting/host/differ_block.h" +#include "base/cpu.h" #include "build/build_config.h" -#include "media/base/cpu_features.h" #include "remoting/host/differ_block_internal.h" namespace remoting { @@ -31,10 +31,11 @@ int BlockDifference(const uint8* image1, const uint8* image2, int stride) { // TODO(hclam): Implement a NEON version. diff_proc = &BlockDifference_C; #else + base::CPU cpu; // For x86 processors, check if SSE2 is supported. - if (media::hasSSE2() && kBlockSize == 32) + if (cpu.has_sse2() && kBlockSize == 32) diff_proc = &BlockDifference_SSE2_W32; - else if (media::hasSSE2() && kBlockSize == 16) + else if (cpu.has_sse2() && kBlockSize == 16) diff_proc = &BlockDifference_SSE2_W16; else diff_proc = &BlockDifference_C; diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index dce6863..dc72521 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -400,7 +400,7 @@ ], 'sources': [ # The jsoncpp target is not yet built for Mac OS X 64-bit, so - # include the files directly, instead of depending on the target. + # include the files directly, instead of depending on the target. '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp', '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', '../third_party/modp_b64/modp_b64.cc', @@ -461,7 +461,7 @@ }, # end of target 'remoting_host_prefpane' ], # end of 'targets' }], # 'OS=="mac"' - + ['OS=="win"', { 'targets': [ { @@ -1588,9 +1588,6 @@ 'target_name': 'differ_block', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, - 'dependencies': [ - '../media/media.gyp:cpu_features', - ], 'conditions': [ [ 'target_arch == "ia32" or target_arch == "x64"', { 'dependencies': [ |