a96e2d77cb
I removed the 'libjingle' target in talk/libjingle.gyp and replaced all users of it with base/base.gyp:rtc_base. It seems the jsoncpp and expat dependencies were not used by it's previous references. The files in talk/media/testdata were uploaded to Google Storage and added .sha1 files in resources/media instead of simply moving them. The previously disabled warnings that were inherited from talk/build/common.gypi are now replaced by target-specific disabling of only the failing warnings. Additional disabling was needed since the stricter compilation warnings that applies to code in webrtc/. License headers will be updated in a follow-up CL in order to not break Git history. Other modifications: * Updated the header guards. * Sorted the includes using chromium/src/tools/sort-headers.py except for these files: talk/app/webrtc/peerconnectionendtoend_unittest.cc talk/app/webrtc/java/jni/androidmediadecoder_jni.cc talk/app/webrtc/java/jni/androidmediaencoder_jni.cc webrtc/media/devices/win32devicemanager.cc. * Unused GYP reference to libjingle_tests_additional_deps was removed. * Removed duplicated GYP entries of webrtc/base/testutils.cc webrtc/base/testutils.h The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media, so they were moved to the media.gyp. I also checked that none of EXPAT_RELATIVE_PATH, FEATURE_ENABLE_VOICEMAIL, GTEST_RELATIVE_PATH, JSONCPP_RELATIVE_PATH, LOGGING=1, SRTP_RELATIVE_PATH, FEATURE_ENABLE_SSL, FEATURE_ENABLE_VOICEMAIL, FEATURE_ENABLE_PSTN, HAVE_SCTP, HAVE_SRTP, are used by the talk/media code. For Chromium, the following changes will need to be applied to the roll CL that updates the DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/ BUG=webrtc:5420 NOPRESUBMIT=True TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1587193006 Cr-Commit-Position: refs/heads/master@{#11495}
81 lines
3.1 KiB
C++
81 lines
3.1 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "webrtc/media/base/cpuid.h"
|
|
|
|
#include "libyuv/cpu_id.h"
|
|
|
|
namespace cricket {
|
|
|
|
bool CpuInfo::TestCpuFlag(int flag) {
|
|
return libyuv::TestCpuFlag(flag) ? true : false;
|
|
}
|
|
|
|
void CpuInfo::MaskCpuFlagsForTest(int enable_flags) {
|
|
libyuv::MaskCpuFlags(enable_flags);
|
|
}
|
|
|
|
// Detect an Intel Core I5 or better such as 4th generation Macbook Air.
|
|
bool IsCoreIOrBetter() {
|
|
#if defined(__i386__) || defined(__x86_64__) || \
|
|
defined(_M_IX86) || defined(_M_X64)
|
|
uint32_t cpu_info[4];
|
|
libyuv::CpuId(0, 0, &cpu_info[0]); // Function 0: Vendor ID
|
|
if (cpu_info[1] == 0x756e6547 && cpu_info[3] == 0x49656e69 &&
|
|
cpu_info[2] == 0x6c65746e) { // GenuineIntel
|
|
// Detect CPU Family and Model
|
|
// 3:0 - Stepping
|
|
// 7:4 - Model
|
|
// 11:8 - Family
|
|
// 13:12 - Processor Type
|
|
// 19:16 - Extended Model
|
|
// 27:20 - Extended Family
|
|
libyuv::CpuId(1, 0, &cpu_info[0]); // Function 1: Family and Model
|
|
int family = ((cpu_info[0] >> 8) & 0x0f) | ((cpu_info[0] >> 16) & 0xff0);
|
|
int model = ((cpu_info[0] >> 4) & 0x0f) | ((cpu_info[0] >> 12) & 0xf0);
|
|
// CpuFamily | CpuModel | Name
|
|
// 6 | 14 | Yonah -- Core
|
|
// 6 | 15 | Merom -- Core 2
|
|
// 6 | 23 | Penryn -- Core 2 (most common)
|
|
// 6 | 26 | Nehalem -- Core i*
|
|
// 6 | 28 | Atom
|
|
// 6 | 30 | Lynnfield -- Core i*
|
|
// 6 | 37 | Westmere -- Core i*
|
|
const int kAtom = 28;
|
|
const int kCore2 = 23;
|
|
if (family < 6 || family == 15 ||
|
|
(family == 6 && (model == kAtom || model <= kCore2))) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
#endif
|
|
return false;
|
|
}
|
|
|
|
} // namespace cricket
|