generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove WEBRTC_MAC_INTEL.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/765008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2715 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-09-06 18:17:00 +00:00
parent b3b158db2e
commit f3b65dbfe8
16 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/build/common.gypi
View File

@ -168,7 +168,6 @@
['OS=="mac"', { ['OS=="mac"', {
'defines': [ 'defines': [
'WEBRTC_MAC', 'WEBRTC_MAC',
'WEBRTC_MAC_INTEL', # TODO(andrew): remove this.
'WEBRTC_THREAD_RR', 'WEBRTC_THREAD_RR',
'WEBRTC_CLOCK_TYPE_REALTIME', 'WEBRTC_CLOCK_TYPE_REALTIME',
], ],

8
src/modules/audio_device/main/source/audio_device_impl.cc
View File

@ -40,7 +40,7 @@
#elif defined(MAC_IPHONE) #elif defined(MAC_IPHONE)
#include "audio_device_utility_iphone.h" #include "audio_device_utility_iphone.h"
#include "audio_device_iphone.h" #include "audio_device_iphone.h"
#elif (defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC)) #elif defined(WEBRTC_MAC)
#include "audio_device_utility_mac.h" #include "audio_device_utility_mac.h"
#include "audio_device_mac.h" #include "audio_device_mac.h"
#endif #endif
@ -159,7 +159,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::CheckPlatform()
#elif defined(WEBRTC_LINUX) #elif defined(WEBRTC_LINUX)
platform = kPlatformLinux; platform = kPlatformLinux;
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX");
#elif (defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC)) #elif defined(WEBRTC_MAC)
platform = kPlatformMac; platform = kPlatformMac;
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is MAC"); WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is MAC");
#endif #endif
@ -354,7 +354,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
// Create the *Mac* implementation of the Audio Device // Create the *Mac* implementation of the Audio Device
// //
#elif defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC) #elif defined(WEBRTC_MAC)
if (audioLayer == kPlatformDefaultAudio) if (audioLayer == kPlatformDefaultAudio)
{ {
// Create *Mac Audio* implementation // Create *Mac Audio* implementation
@ -367,7 +367,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::CreatePlatformSpecificObjects()
// Create the Mac implementation of the Device Utility. // Create the Mac implementation of the Device Utility.
ptrAudioDeviceUtility = new AudioDeviceUtilityMac(Id()); ptrAudioDeviceUtility = new AudioDeviceUtilityMac(Id());
} }
#endif // #if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC) #endif // WEBRTC_MAC
// Create the *Dummy* implementation of the Audio Device // Create the *Dummy* implementation of the Audio Device
// Available for all platforms // Available for all platforms

4
src/modules/udp_transport/source/udp_socket_posix.cc
View File

@ -183,7 +183,7 @@ void UdpSocketPosix::HasIncoming()
WebRtc_Word8 buf[2048]; WebRtc_Word8 buf[2048];
int retval; int retval;
SocketAddress from; SocketAddress from;
#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC) #if defined(WEBRTC_MAC)
sockaddr sockaddrfrom; sockaddr sockaddrfrom;
memset(&from, 0, sizeof(from)); memset(&from, 0, sizeof(from));
memset(&sockaddrfrom, 0, sizeof(sockaddrfrom)); memset(&sockaddrfrom, 0, sizeof(sockaddrfrom));
@ -193,7 +193,7 @@ void UdpSocketPosix::HasIncoming()
socklen_t fromlen = sizeof(from); socklen_t fromlen = sizeof(from);
#endif #endif
#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_MAC) #if defined(WEBRTC_MAC)
retval = recvfrom(_socket,buf, sizeof(buf), 0, retval = recvfrom(_socket,buf, sizeof(buf), 0,
reinterpret_cast<sockaddr*>(&sockaddrfrom), &fromlen); reinterpret_cast<sockaddr*>(&sockaddrfrom), &fromlen);
memcpy(&from, &sockaddrfrom, fromlen); memcpy(&from, &sockaddrfrom, fromlen);

6
src/modules/video_capture/main/source/device_info_impl.cc
View File

@ -54,7 +54,7 @@ WebRtc_Word32 DeviceInfoImpl::NumberOfCapabilities(
if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8)) if (_lastUsedDeviceNameLength == strlen((char*) deviceUniqueIdUTF8))
{ {
// Is it the same device that is asked for again. // Is it the same device that is asked for again.
#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) #if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
if(strncasecmp((char*)_lastUsedDeviceName, if(strncasecmp((char*)_lastUsedDeviceName,
(char*) deviceUniqueIdUTF8, (char*) deviceUniqueIdUTF8,
_lastUsedDeviceNameLength)==0) _lastUsedDeviceNameLength)==0)
@ -91,7 +91,7 @@ WebRtc_Word32 DeviceInfoImpl::GetCapability(const char* deviceUniqueIdUTF8,
ReadLockScoped cs(_apiLock); ReadLockScoped cs(_apiLock);
if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8))
#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) #if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
|| (strncasecmp((char*)_lastUsedDeviceName, || (strncasecmp((char*)_lastUsedDeviceName,
(char*) deviceUniqueIdUTF8, (char*) deviceUniqueIdUTF8,
_lastUsedDeviceNameLength)!=0)) _lastUsedDeviceNameLength)!=0))
@ -155,7 +155,7 @@ WebRtc_Word32 DeviceInfoImpl::GetBestMatchedCapability(
ReadLockScoped cs(_apiLock); ReadLockScoped cs(_apiLock);
if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8)) if ((_lastUsedDeviceNameLength != strlen((char*) deviceUniqueIdUTF8))
#if defined(WEBRTC_MAC_INTEL) || defined(WEBRTC_LINUX) #if defined(WEBRTC_MAC) || defined(WEBRTC_LINUX)
|| (strncasecmp((char*)_lastUsedDeviceName, || (strncasecmp((char*)_lastUsedDeviceName,
(char*) deviceUniqueIdUTF8, (char*) deviceUniqueIdUTF8,
_lastUsedDeviceNameLength)!=0)) _lastUsedDeviceNameLength)!=0))

12
src/modules/video_render/main/source/video_render_impl.cc
View File

@ -24,7 +24,7 @@
#include "windows/video_render_windows_impl.h" #include "windows/video_render_windows_impl.h"
#define STANDARD_RENDERING kRenderWindows #define STANDARD_RENDERING kRenderWindows
// MAC_IPHONE should go before WEBRTC_MAC_INTEL because WEBRTC_MAC_INTEL // MAC_IPHONE should go before WEBRTC_MAC because WEBRTC_MAC
// gets defined if MAC_IPHONE is defined // gets defined if MAC_IPHONE is defined
#elif defined(MAC_IPHONE) #elif defined(MAC_IPHONE)
#if defined(IPHONE_GLES_RENDERING) #if defined(IPHONE_GLES_RENDERING)
@ -32,7 +32,7 @@
#include "iPhone/video_render_iphone_impl.h" #include "iPhone/video_render_iphone_impl.h"
#endif #endif
#elif defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
#define STANDARD_RENDERING kRenderCocoa #define STANDARD_RENDERING kRenderCocoa
#include "mac/video_render_mac_cocoa_impl.h" #include "mac/video_render_mac_cocoa_impl.h"
@ -127,7 +127,7 @@ ModuleVideoRenderImpl::ModuleVideoRenderImpl(
} }
break; break;
#elif defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
case kRenderCocoa: case kRenderCocoa:
@ -256,7 +256,7 @@ ModuleVideoRenderImpl::~ModuleVideoRenderImpl()
delete ptrRenderer; delete ptrRenderer;
} }
break; break;
#elif defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
case kRenderCocoa: case kRenderCocoa:
@ -350,7 +350,7 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window)
#ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER #ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
#if defined(MAC_IPHONE) // MAC_IPHONE must go before WEBRTC_MAC or WEBRTC_MAC_INTEL #if defined(MAC_IPHONE) // MAC_IPHONE must go before WEBRTC_MAC
_ptrRenderer = NULL; _ptrRenderer = NULL;
delete _ptrRenderer; delete _ptrRenderer;
@ -363,7 +363,7 @@ WebRtc_Word32 ModuleVideoRenderImpl::ChangeWindow(void* window)
_ptrRenderer = reinterpret_cast<IVideoRender*>(ptrRenderer); _ptrRenderer = reinterpret_cast<IVideoRender*>(ptrRenderer);
return _ptrRenderer->ChangeWindow(window); return _ptrRenderer->ChangeWindow(window);
#elif defined(WEBRTC_MAC) | defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
_ptrRenderer = NULL; _ptrRenderer = NULL;
delete _ptrRenderer; delete _ptrRenderer;

2
src/modules/video_render/main/test/testAPI/testAPI.cc
View File

@ -77,7 +77,7 @@ unsigned long timeGetTime()
return(val); return(val);
} }
#elif defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#include <unistd.h> #include <unistd.h>

4
src/system_wrappers/source/condition_variable.cc
View File

@ -16,7 +16,7 @@
#include <pthread.h> #include <pthread.h>
#include "condition_variable_wrapper.h" #include "condition_variable_wrapper.h"
#include "condition_variable_posix.h" #include "condition_variable_posix.h"
#elif defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#include <pthread.h> #include <pthread.h>
#include "condition_variable_wrapper.h" #include "condition_variable_wrapper.h"
#include "condition_variable_posix.h" #include "condition_variable_posix.h"
@ -28,7 +28,7 @@ ConditionVariableWrapper::CreateConditionVariable()
{ {
#if defined(_WIN32) #if defined(_WIN32)
return new ConditionVariableWindows; return new ConditionVariableWindows;
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
return ConditionVariablePosix::Create(); return ConditionVariablePosix::Create();
#else #else
return NULL; return NULL;

4
src/system_wrappers/source/cpu.cc
View File

@ -14,8 +14,6 @@
#include "cpu_win.h" #include "cpu_win.h"
#elif defined(WEBRTC_MAC) #elif defined(WEBRTC_MAC)
#include "cpu_mac.h" #include "cpu_mac.h"
#elif defined(WEBRTC_MAC_INTEL)
#include "cpu_mac.h"
#elif defined(WEBRTC_ANDROID) #elif defined(WEBRTC_ANDROID)
// Not implemented yet, might be possible to use Linux implementation // Not implemented yet, might be possible to use Linux implementation
#else // defined(WEBRTC_LINUX) #else // defined(WEBRTC_LINUX)
@ -27,7 +25,7 @@ CpuWrapper* CpuWrapper::CreateCpu()
{ {
#if defined(_WIN32) #if defined(_WIN32)
return new CpuWindows(); return new CpuWindows();
#elif (defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL)) #elif defined(WEBRTC_MAC)
return new CpuWrapperMac(); return new CpuWrapperMac();
#elif defined(WEBRTC_ANDROID) #elif defined(WEBRTC_ANDROID)
return 0; return 0;

4
src/system_wrappers/source/cpu_info.cc
View File

@ -15,8 +15,6 @@
#elif defined(WEBRTC_MAC) #elif defined(WEBRTC_MAC)
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#elif defined(WEBRTC_MAC_INTEL)
// Intentionally empty
#elif defined(WEBRTC_ANDROID) #elif defined(WEBRTC_ANDROID)
// Not implemented yet, might be possible to use Linux implementation // Not implemented yet, might be possible to use Linux implementation
#else // defined(WEBRTC_LINUX) #else // defined(WEBRTC_LINUX)
@ -45,7 +43,7 @@ WebRtc_UWord32 CpuInfo::DetectNumberOfCores()
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1, WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Available number of cores:%d", _numberOfCores); "Available number of cores:%d", _numberOfCores);
#elif (defined(WEBRTC_MAC) || defined(WEBRTC_MAC_INTEL)) #elif defined(WEBRTC_MAC)
int name[] = {CTL_HW, HW_AVAILCPU}; int name[] = {CTL_HW, HW_AVAILCPU};
int ncpu; int ncpu;
size_t size = sizeof(ncpu); size_t size = sizeof(ncpu);

4
src/system_wrappers/source/event.cc
View File

@ -13,7 +13,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include "event_win.h" #include "event_win.h"
#elif defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <pthread.h> #include <pthread.h>
#include "event_posix.h" #include "event_posix.h"
@ -49,7 +49,7 @@ int EventWrapper::KeyPressed()
{ {
return 0; return 0;
} }
#elif defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
bool keyDown = false; bool keyDown = false;
// loop through all Mac virtual key constant values // loop through all Mac virtual key constant values
for(int keyIndex = 0; keyIndex <= 0x5C; keyIndex++) for(int keyIndex = 0; keyIndex <= 0x5C; keyIndex++)

5
src/system_wrappers/source/thread_posix.cc
View File

@ -157,9 +157,8 @@ ThreadPosix::~ThreadPosix()
delete _crit_state; delete _crit_state;
} }
#define HAS_THREAD_ID !defined(MAC_IPHONE) && !defined(MAC_IPHONE_SIM) && \ #define HAS_THREAD_ID !defined(MAC_IPHONE) && !defined(MAC_IPHONE_SIM) && \
!defined(WEBRTC_MAC) && !defined(WEBRTC_MAC_INTEL) && \ !defined(WEBRTC_MAC)
!defined(MAC_DYLIB) && !defined(MAC_INTEL_DYLIB)
#if HAS_THREAD_ID #if HAS_THREAD_ID
bool ThreadPosix::Start(unsigned int& threadID) bool ThreadPosix::Start(unsigned int& threadID)
#else #else

2
src/video_engine/test/auto_test/interface/vie_autotest_defines.h
View File

@ -192,7 +192,7 @@ private:
// milliseconds // milliseconds
#if defined(_WIN32) #if defined(_WIN32)
#define AutoTestSleep ::Sleep #define AutoTestSleep ::Sleep
#elif defined(WEBRTC_MAC_INTEL) #elif defined(WEBRTC_MAC)
#define AutoTestSleep(x) usleep(x * 1000) #define AutoTestSleep(x) usleep(x * 1000)
#elif defined(WEBRTC_LINUX) #elif defined(WEBRTC_LINUX)
namespace { namespace {

8
src/video_engine/test/auto_test/source/vie_autotest_capture.cc
View File

@ -140,7 +140,7 @@ void ViEAutoTest::ViECaptureStandardTest() {
ViETest::Log("Found capture device %s\nUnique name %s", ViETest::Log("Found capture device %s\nUnique name %s",
device_name, device_unique_name); device_name, device_unique_name);
#if !defined(WEBRTC_MAC_INTEL) // these functions will return -1 #if !defined(WEBRTC_MAC) // these functions will return -1
int number_of_capabilities = int number_of_capabilities =
dev_info->NumberOfCapabilities(device_unique_name); dev_info->NumberOfCapabilities(device_unique_name);
EXPECT_GT(number_of_capabilities, 0); EXPECT_GT(number_of_capabilities, 0);
@ -163,8 +163,8 @@ void ViEAutoTest::ViECaptureStandardTest() {
} }
#endif #endif
} }
// Capture Capability Functions are not supported on WEBRTC_MAC_INTEL. // Capture Capability Functions are not supported on WEBRTC_MAC.
#if !defined(WEBRTC_MAC_INTEL) #if !defined(WEBRTC_MAC)
// Check allocation. Try to allocate them all after each other. // Check allocation. Try to allocate them all after each other.
for (int device_index = 0; device_index < number_of_capture_devices; for (int device_index = 0; device_index < number_of_capture_devices;
@ -250,7 +250,7 @@ void ViEAutoTest::ViECaptureStandardTest() {
#endif // !WEBRTC_ANDROID #endif // !WEBRTC_ANDROID
vcpms[device_index]->Release(); vcpms[device_index]->Release();
} }
#endif // !WEBRTC_MAC_INTEL #endif // !WEBRTC_MAC
} }
void ViEAutoTest::ViECaptureExtendedTest() { void ViEAutoTest::ViECaptureExtendedTest() {

2
src/video_engine/test/auto_test/source/vie_autotest_network.cc
View File

@ -23,8 +23,6 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <qos.h> #include <qos.h>
#elif defined(WEBRTC_MAC_INTEL)
#endif #endif
class ViEAutoTestNetworkObserver: public webrtc::ViENetworkObserver class ViEAutoTestNetworkObserver: public webrtc::ViENetworkObserver

6
src/video_engine/vie_capture_impl.cc
View File

@ -419,7 +419,7 @@ int ViECaptureImpl::NumberOfCapabilities(
WEBRTC_TRACE(kTraceApiCall, kTraceVideo, ViEId(shared_data_->instance_id()), WEBRTC_TRACE(kTraceApiCall, kTraceVideo, ViEId(shared_data_->instance_id()),
"%s(capture_device_name: %s)", __FUNCTION__, unique_idUTF8); "%s(capture_device_name: %s)", __FUNCTION__, unique_idUTF8);
#if defined(WEBRTC_MAC_INTEL) #if defined(WEBRTC_MAC)
// TODO(mflodman) Move to capture module! // TODO(mflodman) Move to capture module!
// QTKit framework handles all capabilities and capture settings // QTKit framework handles all capabilities and capture settings
// automatically (mandatory). // automatically (mandatory).
@ -450,7 +450,7 @@ int ViECaptureImpl::GetCaptureCapability(const char* unique_idUTF8,
WEBRTC_TRACE(kTraceApiCall, kTraceVideo, ViEId(shared_data_->instance_id()), WEBRTC_TRACE(kTraceApiCall, kTraceVideo, ViEId(shared_data_->instance_id()),
"%s(capture_device_name: %s)", __FUNCTION__, unique_idUTF8); "%s(capture_device_name: %s)", __FUNCTION__, unique_idUTF8);
#if defined(WEBRTC_MAC_INTEL) #if defined(WEBRTC_MAC)
// TODO(mflodman) Move to capture module! // TODO(mflodman) Move to capture module!
// QTKit framework handles all capabilities and capture settings // QTKit framework handles all capabilities and capture settings
// automatically (mandatory). // automatically (mandatory).
@ -483,7 +483,7 @@ int ViECaptureImpl::ShowCaptureSettingsDialogBox(
void* parent_window, void* parent_window,
const unsigned int x, const unsigned int x,
const unsigned int y) { const unsigned int y) {
#if defined(WEBRTC_MAC_INTEL) #if defined(WEBRTC_MAC)
// TODO(mflodman) Move to capture module // TODO(mflodman) Move to capture module
// QTKit framework handles all capabilities and capture settings // QTKit framework handles all capabilities and capture settings
// automatically (mandatory). // automatically (mandatory).

2
src/video_engine/vie_defines.h
View File

@ -148,7 +148,7 @@ inline int ChannelId(const int moduleId) {
#endif #endif
// Mac specific. // Mac specific.
#ifdef WEBRTC_MAC_INTEL #ifdef WEBRTC_MAC
#define SLEEP(x) usleep(x * 1000) #define SLEEP(x) usleep(x * 1000)
// Build information macros. // Build information macros.