admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2317343003/ )

Browse Source 
Reason for revert:
Build issues have now _really_ been fixed

Original issue's description:
> Revert of move all reference to carbon api (patchset #2 id:300001 of https://codereview.webrtc.org/2321493002/ )
>
> Reason for revert:
> Still breaks Chromium mac compile:
> [4542/22193] CXX obj/third_party/webrtc/base/rtc_base/unixfilesystem.o
> FAILED: obj/third_party/webrtc/base/rtc_base/unixfilesystem.o
> /b/c/cipd/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/webrtc/base/rtc_base/unixfilesystem.o.d -DLOGGING=1 -DV8_DEPRECATION_WARNINGS -DENABLE_NOTIFICATIONS -DENABLE_PEPPER_CDMS -DENABLE_PLUGINS=1 -DENABLE_PDF=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DDCHECK_ALWAYS_ON=1 -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DENABLE_WEBRTC=1 -DENABLE_EXTENSIONS=1 -DENABLE_TASK_MANAGER=1 -DENABLE_THEMES=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DUSE_PROPRIETARY_CODECS -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=280106-1 -DCR_XCODE_VERSION=0511 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DWEBRTC_RESTRICT_LOGGING -DEXPAT_RELATIVE_PATH -DENABLE_EXTERNAL_AUTH -DHAVE_OPENSSL_SSL_H -DHAVE_SCTP -DHAVE_SRTP -DHAVE_WEBRTC_VIDEO -DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DSRTP_RELATIVE_PATH -DSSL_USE_OPENSSL -DUSE_WEBRTC_DEV_BRANCH -DSSL_USE_OPENSSL -DHAVE_OPENSSL_SSL_H -DFEATURE_ENABLE_SSL -DLOGGING=1 -DFEATURE_ENABLE_SSL -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_MAC -DNO_MAIN_THREAD_WRAPPING -I../../third_party/webrtc_overrides -I../../third_party/boringssl/src/include -I../.. -Igen -I../../third_party/jsoncpp/overrides/include -I../../third_party/jsoncpp/source/include -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -Wno-uninitialized -fno-strict-aliasing -fstack-protector -fcolor-diagnostics -arch x86_64 -O2 -g1 -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -mmacosx-version-min=10.7 -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -Wheader-hygiene -Wstring-conversion -Werror -Wall -Wno-unused-variable -Wpartial-availability -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-shift-negative-value -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -fno-threadsafe-statics -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -fno-rtti -fno-exceptions -c ../../third_party/webrtc/base/unixfilesystem.cc -o obj/third_party/webrtc/base/rtc_base/unixfilesystem.o
> ../../third_party/webrtc/base/unixfilesystem.cc:375:11: error: variable has incomplete type 'FSRef'
>     FSRef fr;
>           ^
> /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFURL.h:467:8: note: forward declaration of 'FSRef'
> struct FSRef;
>        ^
> ../../third_party/webrtc/base/unixfilesystem.cc:376:27: error: use of undeclared identifier 'kUserDomain'
>     if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType,
>                           ^
> ../../third_party/webrtc/base/unixfilesystem.cc:376:40: error: use of undeclared identifier 'kApplicationSupportFolderType'
>     if (0 != FSFindFolder(kUserDomain, kApplicationSupportFolderType,
>                                        ^
> ../../third_party/webrtc/base/unixfilesystem.cc:377:27: error: use of undeclared identifier 'kCreateFolder'; did you mean 'CreateFolder'?
>                           kCreateFolder, &fr))
>                           ^~~~~~~~~~~~~
>                           CreateFolder
> ../../third_party/webrtc/base/unixfilesystem.cc:92:22: note: 'CreateFolder' declared here
> bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) {
>
> Original issue's description:
> > Reland of move all reference to carbon api (patchset #1 id:1 of https://codereview.webrtc.org/2316563002/ )
> >
> > Reason for revert:
> > Chromium build issues have been resolved.
> >
> > Original issue's description:
> > > Revert of Remove all reference to carbon api (patchset #2 id:20001 of https://codereview.webrtc.org/2299633002/ )
> > >
> > > Reason for revert:
> > > Breaks chromium build
> > >
> > > Original issue's description:
> > > > Remove all reference to carbon api
> > > >
> > > > BUG=webrtc:6282
> > > >
> > > > Committed: https://crrev.com/dbd8b6bec4143c940b2f2ca8cd85c25d17327964
> > > > Cr-Commit-Position: refs/heads/master@{#14080}
> > >
> > > TBR=magjed@webrtc.org,mflodman@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:6282
> > >
> > > Committed: https://crrev.com/b096aa7fd375a980daab3a986596548ca5de2a1c
> > > Cr-Commit-Position: refs/heads/master@{#14081}
> >
> > TBR=magjed@webrtc.org,mflodman@webrtc.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=webrtc:6282
> >
> > Committed: https://crrev.com/a90879b64fd8db57c0274169311d6b51dd59f1a0
> > Cr-Commit-Position: refs/heads/master@{#14125}
>
> TBR=mflodman@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6282
>
> Committed: https://crrev.com/4e0581f543b026cbc31c3b24cf65c7f51dcd6124
> Cr-Commit-Position: refs/heads/master@{#14133}

TBR=mflodman@webrtc.org,magjed@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6282

Review-Url: https://codereview.webrtc.org/2327573002
Cr-Commit-Position: refs/heads/master@{#14155}
This commit is contained in:
kthelgason 2016-09-09 03:19:48 -07:00 committed by Commit bot
parent 27c7b8ff11
commit d5472246a5
21 changed files with 27 additions and 842 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/BUILD.gn
View File

@ -559,10 +559,6 @@ if (rtc_include_tests) {
"base/sslstreamadapter_unittest.cc", "base/sslstreamadapter_unittest.cc",
] ]
} }
if (is_ios || (is_mac && target_cpu != "x86")) {
defines = [ "CARBON_DEPRECATED=YES" ]
}
if (rtc_use_quic) { if (rtc_use_quic) {
sources += [ sources += [
"p2p/quic/quicconnectionhelper_unittest.cc", "p2p/quic/quicconnectionhelper_unittest.cc",
@ -825,9 +821,6 @@ if (rtc_include_tests) {
if (is_mac) { if (is_mac) {
sources += [ "base/macsocketserver_unittest.cc" ] sources += [ "base/macsocketserver_unittest.cc" ]
} }
if (is_ios || (is_mac && target_cpu != "x86")) {
defines = [ "CARBON_DEPRECATED=YES" ]
}
if (is_clang) { if (is_clang) {
# Suppress warnings from the Chromium Clang plugin. # Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.

9
webrtc/base/BUILD.gn
View File

@ -63,9 +63,6 @@ config("rtc_base_all_dependent_config") {
"Security.framework", "Security.framework",
"SystemConfiguration.framework", "SystemConfiguration.framework",
] ]
if (current_cpu == "x86") {
libs += [ "Carbon.framework" ]
}
} }
} }
@ -289,6 +286,7 @@ rtc_static_library("rtc_base") {
defines = [ "LOGGING=1" ] defines = [ "LOGGING=1" ]
sources = [ sources = [
"applefilesystem.mm",
"arraysize.h", "arraysize.h",
"asyncfile.cc", "asyncfile.cc",
"asyncfile.h", "asyncfile.h",
@ -337,7 +335,6 @@ rtc_static_library("rtc_base") {
"httpcommon.h", "httpcommon.h",
"httprequest.cc", "httprequest.cc",
"httprequest.h", "httprequest.h",
"iosfilesystem.mm",
"ipaddress.cc", "ipaddress.cc",
"ipaddress.h", "ipaddress.h",
"linked_ptr.h", "linked_ptr.h",
@ -667,10 +664,6 @@ rtc_static_library("rtc_base") {
} }
} }
if (is_ios || (is_mac && current_cpu != "x86")) {
defines += [ "CARBON_DEPRECATED=YES" ]
}
if (is_linux || is_android) { if (is_linux || is_android) {
sources += [ sources += [
"linux.cc", "linux.cc",

8
webrtc/base/iosfilesystem.mm → webrtc/base/applefilesystem.mm
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
// This file only exists because various iOS system APIs are only // This file only exists because various iOS and macOS system APIs are only
// available from Objective-C. See unixfilesystem.cc for the only use // available from Objective-C. See unixfilesystem.cc for the only use
// (enforced by a lack of a header file). // (enforced by a lack of a header file).
@ -33,7 +33,7 @@ static char* copyString(NSString* s) {
} }
// Return a (leaked) copy of a directory name suitable for application data. // Return a (leaked) copy of a directory name suitable for application data.
char* IOSDataDirectory() { char* AppleDataDirectory() {
NSArray* paths = NSSearchPathForDirectoriesInDomains( NSArray* paths = NSSearchPathForDirectoriesInDomains(
NSApplicationSupportDirectory, NSUserDomainMask, YES); NSApplicationSupportDirectory, NSUserDomainMask, YES);
ASSERT([paths count] == 1); ASSERT([paths count] == 1);
@ -41,12 +41,12 @@ char* IOSDataDirectory() {
} }
// Return a (leaked) copy of a directory name suitable for use as a $TEMP. // Return a (leaked) copy of a directory name suitable for use as a $TEMP.
char* IOSTempDirectory() { char* AppleTempDirectory() {
return copyString(NSTemporaryDirectory()); return copyString(NSTemporaryDirectory());
} }
// Return the binary's path. // Return the binary's path.
void IOSAppName(rtc::Pathname* path) { void AppleAppName(rtc::Pathname* path) {
NSProcessInfo* pInfo = [NSProcessInfo processInfo]; NSProcessInfo* pInfo = [NSProcessInfo processInfo];
NSString* argv0 = [[pInfo arguments] objectAtIndex:0]; NSString* argv0 = [[pInfo arguments] objectAtIndex:0];
path->SetPathname([argv0 UTF8String]); path->SetPathname([argv0 UTF8String]);

20
webrtc/base/base.gyp
View File

@ -229,6 +229,7 @@
'LOGGING=1', 'LOGGING=1',
], ],
'sources': [ 'sources': [
'applefilesystem.mm',
'arraysize.h', 'arraysize.h',
'asyncfile.cc', 'asyncfile.cc',
'asyncfile.h', 'asyncfile.h',
@ -277,7 +278,6 @@
'httpcommon.h', 'httpcommon.h',
'httprequest.cc', 'httprequest.cc',
'httprequest.h', 'httprequest.h',
'iosfilesystem.mm',
'ipaddress.cc', 'ipaddress.cc',
'ipaddress.h', 'ipaddress.h',
'linked_ptr.h', 'linked_ptr.h',
@ -603,19 +603,6 @@
}, },
}, },
}, },
'conditions': [
['target_arch=="ia32"', {
'all_dependent_settings': {
'link_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework Carbon',
],
},
},
},
}],
],
}], }],
['OS=="win" and nacl_untrusted_build==0', { ['OS=="win" and nacl_untrusted_build==0', {
'sources': [ 'sources': [
@ -664,11 +651,6 @@
}, },
} }
}], }],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'defines': [
'CARBON_DEPRECATED=YES',
],
}],
['OS=="linux" or OS=="android"', { ['OS=="linux" or OS=="android"', {
'sources': [ 'sources': [
'linux.cc', 'linux.cc',

171
webrtc/base/macsocketserver.cc
View File

@ -212,175 +212,4 @@ void MacCFSocketServer::OnWakeUpCallback() {
ASSERT(run_loop_ == CFRunLoopGetCurrent()); ASSERT(run_loop_ == CFRunLoopGetCurrent());
CFRunLoopStop(run_loop_); CFRunLoopStop(run_loop_);
} }
///////////////////////////////////////////////////////////////////////////////
// MacCarbonSocketServer
///////////////////////////////////////////////////////////////////////////////
#ifndef CARBON_DEPRECATED
const UInt32 kEventClassSocketServer = 'MCSS';
const UInt32 kEventWakeUp = 'WAKE';
const EventTypeSpec kEventWakeUpSpec[] = {
{ kEventClassSocketServer, kEventWakeUp }
};
std::string DecodeEvent(EventRef event) {
std::string str;
DecodeFourChar(::GetEventClass(event), &str);
str.push_back(':');
DecodeFourChar(::GetEventKind(event), &str);
return str;
}
MacCarbonSocketServer::MacCarbonSocketServer()
: event_queue_(GetCurrentEventQueue()), wake_up_(NULL) {
VERIFY(noErr == CreateEvent(NULL, kEventClassSocketServer, kEventWakeUp, 0,
kEventAttributeUserEvent, &wake_up_));
}
MacCarbonSocketServer::~MacCarbonSocketServer() {
if (wake_up_) {
ReleaseEvent(wake_up_);
}
}
bool MacCarbonSocketServer::Wait(int cms, bool process_io) {
ASSERT(GetCurrentEventQueue() == event_queue_);
// Listen to all events if we're processing I/O.
// Only listen for our wakeup event if we're not.
UInt32 num_types = 0;
const EventTypeSpec* events = NULL;
if (!process_io) {
num_types = GetEventTypeCount(kEventWakeUpSpec);
events = kEventWakeUpSpec;
}
EventTargetRef target = GetEventDispatcherTarget();
EventTimeout timeout =
(kForever == cms) ? kEventDurationForever : cms / 1000.0;
EventTimeout end_time = GetCurrentEventTime() + timeout;
bool done = false;
while (!done) {
EventRef event;
OSStatus result = ReceiveNextEvent(num_types, events, timeout, true,
&event);
if (noErr == result) {
if (wake_up_ != event) {
LOG_F(LS_VERBOSE) << "Dispatching event: " << DecodeEvent(event);
result = SendEventToEventTarget(event, target);
if ((noErr != result) && (eventNotHandledErr != result)) {
LOG_E(LS_ERROR, OS, result) << "SendEventToEventTarget";
}
} else {
done = true;
}
ReleaseEvent(event);
} else if (eventLoopTimedOutErr == result) {
ASSERT(cms != kForever);
done = true;
} else if (eventLoopQuitErr == result) {
// Ignore this... we get spurious quits for a variety of reasons.
LOG_E(LS_VERBOSE, OS, result) << "ReceiveNextEvent";
} else {
// Some strange error occurred. Log it.
LOG_E(LS_WARNING, OS, result) << "ReceiveNextEvent";
return false;
}
if (kForever != cms) {
timeout = end_time - GetCurrentEventTime();
}
}
return true;
}
void MacCarbonSocketServer::WakeUp() {
if (!IsEventInQueue(event_queue_, wake_up_)) {
RetainEvent(wake_up_);
OSStatus result = PostEventToQueue(event_queue_, wake_up_,
kEventPriorityStandard);
if (noErr != result) {
LOG_E(LS_ERROR, OS, result) << "PostEventToQueue";
}
}
}
///////////////////////////////////////////////////////////////////////////////
// MacCarbonAppSocketServer
///////////////////////////////////////////////////////////////////////////////
MacCarbonAppSocketServer::MacCarbonAppSocketServer()
: event_queue_(GetCurrentEventQueue()) {
// Install event handler
VERIFY(noErr == InstallApplicationEventHandler(
NewEventHandlerUPP(WakeUpEventHandler), 1, kEventWakeUpSpec, this,
&event_handler_));
// Install a timer and set it idle to begin with.
VERIFY(noErr == InstallEventLoopTimer(GetMainEventLoop(),
kEventDurationForever,
kEventDurationForever,
NewEventLoopTimerUPP(TimerHandler),
this,
&timer_));
}
MacCarbonAppSocketServer::~MacCarbonAppSocketServer() {
RemoveEventLoopTimer(timer_);
RemoveEventHandler(event_handler_);
}
OSStatus MacCarbonAppSocketServer::WakeUpEventHandler(
EventHandlerCallRef next, EventRef event, void *data) {
QuitApplicationEventLoop();
return noErr;
}
void MacCarbonAppSocketServer::TimerHandler(
EventLoopTimerRef timer, void *data) {
QuitApplicationEventLoop();
}
bool MacCarbonAppSocketServer::Wait(int cms, bool process_io) {
if (!process_io && cms == 0) {
// No op.
return true;
}
if (kForever != cms) {
// Start a timer.
OSStatus error =
SetEventLoopTimerNextFireTime(timer_, cms / 1000.0);
if (error != noErr) {
LOG(LS_ERROR) << "Failed setting next fire time.";
}
}
if (!process_io) {
// No way to listen to common modes and not get socket events, unless
// we disable each one's callbacks.
EnableSocketCallbacks(false);
}
RunApplicationEventLoop();
if (!process_io) {
// Reenable them. Hopefully this won't cause spurious callbacks or
// missing ones while they were disabled.
EnableSocketCallbacks(true);
}
return true;
}
void MacCarbonAppSocketServer::WakeUp() {
// TODO: No-op if there's already a WakeUp in flight.
EventRef wake_up;
VERIFY(noErr == CreateEvent(NULL, kEventClassSocketServer, kEventWakeUp, 0,
kEventAttributeUserEvent, &wake_up));
OSStatus result = PostEventToQueue(event_queue_, wake_up,
kEventPriorityStandard);
if (noErr != result) {
LOG_E(LS_ERROR, OS, result) << "PostEventToQueue";
}
ReleaseEvent(wake_up);
}
#endif
} // namespace rtc } // namespace rtc

59
webrtc/base/macsocketserver.h
View File

@ -11,9 +11,7 @@
#define WEBRTC_BASE_MACSOCKETSERVER_H__ #define WEBRTC_BASE_MACSOCKETSERVER_H__
#include <set> #include <set>
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) // Invalid on IOS #include <CoreFoundation/CoreFoundation.h>
#include <Carbon/Carbon.h>
#endif
#include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/physicalsocketserver.h"
namespace rtc { namespace rtc {
@ -76,61 +74,6 @@ class MacCFSocketServer : public MacBaseSocketServer {
CFRunLoopRef run_loop_; CFRunLoopRef run_loop_;
CFRunLoopSourceRef wake_up_; CFRunLoopSourceRef wake_up_;
}; };
#ifndef CARBON_DEPRECATED
///////////////////////////////////////////////////////////////////////////////
// MacCarbonSocketServer
///////////////////////////////////////////////////////////////////////////////
// Interacts with the Carbon event queue. While idle it will block,
// waiting for events. When the socket server has work to do, it will
// post a 'wake up' event to the queue, causing the thread to exit the
// event loop until the next call to Wait. Other events are dispatched
// to their target. Supports Carbon and Cocoa UI interaction.
class MacCarbonSocketServer : public MacBaseSocketServer {
public:
MacCarbonSocketServer();
virtual ~MacCarbonSocketServer();
// SocketServer Interface
virtual bool Wait(int cms, bool process_io);
virtual void WakeUp();
private:
EventQueueRef event_queue_;
EventRef wake_up_;
};
///////////////////////////////////////////////////////////////////////////////
// MacCarbonAppSocketServer
///////////////////////////////////////////////////////////////////////////////
// Runs the Carbon application event loop on the current thread while
// idle. When the socket server has work to do, it will post an event
// to the queue, causing the thread to exit the event loop until the
// next call to Wait. Other events are automatically dispatched to
// their target.
class MacCarbonAppSocketServer : public MacBaseSocketServer {
public:
MacCarbonAppSocketServer();
virtual ~MacCarbonAppSocketServer();
// SocketServer Interface
virtual bool Wait(int cms, bool process_io);
virtual void WakeUp();
private:
static OSStatus WakeUpEventHandler(EventHandlerCallRef next, EventRef event,
void *data);
static void TimerHandler(EventLoopTimerRef timer, void *data);
EventQueueRef event_queue_;
EventHandlerRef event_handler_;
EventLoopTimerRef timer_;
};
#endif
} // namespace rtc } // namespace rtc
#endif // WEBRTC_BASE_MACSOCKETSERVER_H__ #endif // WEBRTC_BASE_MACSOCKETSERVER_H__

74
webrtc/base/macsocketserver_unittest.cc
View File

@ -31,64 +31,6 @@ class WakeThread : public Thread {
SocketServer* ss_; SocketServer* ss_;
}; };
#ifndef CARBON_DEPRECATED
// Test that MacCFSocketServer::Wait works as expected.
TEST(MacCFSocketServerTest, TestWait) {
MacCFSocketServer server;
uint32_t start = Time();
server.Wait(1000, true);
EXPECT_GE(TimeSince(start), 1000);
}
// Test that MacCFSocketServer::Wakeup works as expected.
TEST(MacCFSocketServerTest, TestWakeup) {
MacCFSocketServer server;
WakeThread thread(&server);
uint32_t start = Time();
thread.Start();
server.Wait(10000, true);
EXPECT_LT(TimeSince(start), 10000);
}
// Test that MacCarbonSocketServer::Wait works as expected.
TEST(MacCarbonSocketServerTest, TestWait) {
MacCarbonSocketServer server;
uint32_t start = Time();
server.Wait(1000, true);
EXPECT_GE(TimeSince(start), 1000);
}
// Test that MacCarbonSocketServer::Wakeup works as expected.
TEST(MacCarbonSocketServerTest, TestWakeup) {
MacCarbonSocketServer server;
WakeThread thread(&server);
uint32_t start = Time();
thread.Start();
server.Wait(10000, true);
EXPECT_LT(TimeSince(start), 10000);
}
// Test that MacCarbonAppSocketServer::Wait works as expected.
TEST(MacCarbonAppSocketServerTest, TestWait) {
MacCarbonAppSocketServer server;
uint32_t start = Time();
server.Wait(1000, true);
EXPECT_GE(TimeSince(start), 1000);
}
// Test that MacCarbonAppSocketServer::Wakeup works as expected.
TEST(MacCarbonAppSocketServerTest, TestWakeup) {
MacCarbonAppSocketServer server;
WakeThread thread(&server);
uint32_t start = Time();
thread.Start();
server.Wait(10000, true);
EXPECT_LT(TimeSince(start), 10000);
}
#endif
// Test that MacAsyncSocket passes all the generic Socket tests. // Test that MacAsyncSocket passes all the generic Socket tests.
class MacAsyncSocketTest : public SocketTest { class MacAsyncSocketTest : public SocketTest {
protected: protected:
@ -220,20 +162,4 @@ TEST_F(MacAsyncSocketTest, DISABLED_TestGetSetOptionsIPv4) {
TEST_F(MacAsyncSocketTest, DISABLED_TestGetSetOptionsIPv6) { TEST_F(MacAsyncSocketTest, DISABLED_TestGetSetOptionsIPv6) {
SocketTest::TestGetSetOptionsIPv6(); SocketTest::TestGetSetOptionsIPv6();
} }
#ifndef CARBON_DEPRECATED
class MacCarbonAppAsyncSocketTest : public MacAsyncSocketTest {
virtual MacBaseSocketServer* CreateSocketServer() {
return new MacCarbonAppSocketServer();
};
};
TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv4) {
SocketTest::TestSocketServerWaitIPv4();
}
TEST_F(MacCarbonAppAsyncSocketTest, TestSocketServerWaitIPv6) {
SocketTest::TestSocketServerWaitIPv6();
}
#endif
} // namespace rtc } // namespace rtc

81
webrtc/base/macutils.cc
View File

@ -11,6 +11,8 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include <CoreServices/CoreServices.h>
#include "webrtc/base/common.h" #include "webrtc/base/common.h"
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/base/macutils.h" #include "webrtc/base/macutils.h"
@ -46,7 +48,6 @@ bool ToUtf16(const std::string& str8, CFStringRef* str16) {
return NULL != *str16; return NULL != *str16;
} }
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
void DecodeFourChar(UInt32 fc, std::string* out) { void DecodeFourChar(UInt32 fc, std::string* out) {
std::stringstream ss; std::stringstream ss;
ss << '\''; ss << '\'';
@ -128,82 +129,4 @@ MacOSVersionName GetOSVersionName() {
} }
return kMacOSNewer; return kMacOSNewer;
} }
bool RunAppleScript(const std::string& script) {
// TODO(thaloun): Add a .mm file that contains something like this:
// NSString source from script
// NSAppleScript* appleScript = [[NSAppleScript alloc] initWithSource:&source]
// if (appleScript != nil) {
// [appleScript executeAndReturnError:nil]
// [appleScript release]
#ifndef CARBON_DEPRECATED
ComponentInstance component = NULL;
AEDesc script_desc;
AEDesc result_data;
OSStatus err;
OSAID script_id, result_id;
AECreateDesc(typeNull, NULL, 0, &script_desc);
AECreateDesc(typeNull, NULL, 0, &result_data);
script_id = kOSANullScript;
result_id = kOSANullScript;
component = OpenDefaultComponent(kOSAComponentType, typeAppleScript);
if (component == NULL) {
LOG(LS_ERROR) << "Failed opening Apple Script component";
return false;
}
err = AECreateDesc(typeUTF8Text, script.data(), script.size(), &script_desc);
if (err != noErr) {
CloseComponent(component);
LOG(LS_ERROR) << "Failed creating Apple Script description";
return false;
}
err = OSACompile(component, &script_desc, kOSAModeCanInteract, &script_id);
if (err != noErr) {
AEDisposeDesc(&script_desc);
if (script_id != kOSANullScript) {
OSADispose(component, script_id);
}
CloseComponent(component);
LOG(LS_ERROR) << "Error compiling Apple Script";
return false;
}
err = OSAExecute(component, script_id, kOSANullScript, kOSAModeCanInteract,
&result_id);
if (err == errOSAScriptError) {
LOG(LS_ERROR) << "Error when executing Apple Script: " << script;
AECreateDesc(typeNull, NULL, 0, &result_data);
OSAScriptError(component, kOSAErrorMessage, typeChar, &result_data);
int len = AEGetDescDataSize(&result_data);
char* data = (char*)malloc(len);
if (data != NULL) {
err = AEGetDescData(&result_data, data, len);
LOG(LS_ERROR) << "Script error: " << std::string(data, len);
}
AEDisposeDesc(&script_desc);
AEDisposeDesc(&result_data);
return false;
}
AEDisposeDesc(&script_desc);
if (script_id != kOSANullScript) {
OSADispose(component, script_id);
}
if (result_id != kOSANullScript) {
OSADispose(component, result_id);
}
CloseComponent(component);
return true;
#else
// TODO(thaloun): Support applescripts with the NSAppleScript API.
return false;
#endif // CARBON_DEPRECATED
}
#endif // WEBRTC_MAC && !defined(WEBRTC_IOS)
///////////////////////////////////////////////////////////////////////////////
} // namespace rtc } // namespace rtc

7
webrtc/base/macutils.h
View File

@ -12,9 +12,6 @@
#define WEBRTC_BASE_MACUTILS_H__ #define WEBRTC_BASE_MACUTILS_H__
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <Carbon/Carbon.h>
#endif
#include <string> #include <string>
namespace rtc { namespace rtc {
@ -44,10 +41,6 @@ enum MacOSVersionName {
}; };
MacOSVersionName GetOSVersionName(); MacOSVersionName GetOSVersionName();
// Runs the given apple script. Only supports scripts that does not
// require user interaction.
bool RunAppleScript(const std::string& script);
#endif #endif
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

19
webrtc/base/macutils_unittest.cc
View File

@ -16,22 +16,3 @@ TEST(MacUtilsTest, GetOsVersionName) {
LOG(LS_INFO) << "GetOsVersionName " << ver; LOG(LS_INFO) << "GetOsVersionName " << ver;
EXPECT_NE(rtc::kMacOSUnknown, ver); EXPECT_NE(rtc::kMacOSUnknown, ver);
} }
TEST(MacUtilsTest, RunAppleScriptCompileError) {
std::string script("set value to to 5");
EXPECT_FALSE(rtc::RunAppleScript(script));
}
TEST(MacUtilsTest, RunAppleScriptRuntimeError) {
std::string script("set value to 5 / 0");
EXPECT_FALSE(rtc::RunAppleScript(script));
}
#ifdef CARBON_DEPRECATED
TEST(MacUtilsTest, DISABLED_RunAppleScriptSuccess) {
#else
TEST(MacUtilsTest, RunAppleScriptSuccess) {
#endif
std::string script("set value to 5");
EXPECT_TRUE(rtc::RunAppleScript(script));
}

67
webrtc/base/macwindowpicker.cc
View File

@ -106,75 +106,8 @@ bool MacWindowPicker::IsVisible(const WindowId& id) {
} }
bool MacWindowPicker::MoveToFront(const WindowId& id) { bool MacWindowPicker::MoveToFront(const WindowId& id) {
// Init if we're not already initialized.
if (get_window_list_desc_ == NULL && !Init()) {
return false; return false;
} }
CGWindowID ids[1];
ids[0] = id.id();
CFArrayRef window_id_array =
CFArrayCreate(NULL, reinterpret_cast<const void **>(&ids), 1, NULL);
CFArrayRef window_array =
reinterpret_cast<CGWindowListCreateDescriptionFromArrayProc>(
get_window_list_desc_)(window_id_array);
if (window_array == NULL || 0 == CFArrayGetCount(window_array)) {
// Could not find the window. It might have been closed.
LOG(LS_INFO) << "Window not found";
CFRelease(window_id_array);
return false;
}
CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>(
CFArrayGetValueAtIndex(window_array, 0));
CFStringRef window_name_ref = reinterpret_cast<CFStringRef>(
CFDictionaryGetValue(window, kCGWindowName));
CFNumberRef application_pid = reinterpret_cast<CFNumberRef>(
CFDictionaryGetValue(window, kCGWindowOwnerPID));
int pid_val;
CFNumberGetValue(application_pid, kCFNumberIntType, &pid_val);
std::string window_name;
ToUtf8(window_name_ref, &window_name);
// Build an applescript that sets the selected window to front
// within the application. Then set the application to front.
bool result = true;
std::stringstream ss;
ss << "tell application \"System Events\"\n"
<< "set proc to the first item of (every process whose unix id is "
<< pid_val
<< ")\n"
<< "tell proc to perform action \"AXRaise\" of window \""
<< window_name
<< "\"\n"
<< "set the frontmost of proc to true\n"
<< "end tell";
if (!RunAppleScript(ss.str())) {
// This might happen to for example X applications where the X
// server spawns of processes with their own PID but the X server
// is still registered as owner to the application windows. As a
// workaround, we put the X server process to front, meaning that
// all X applications will show up. The drawback with this
// workaround is that the application that we really wanted to set
// to front might be behind another X application.
ProcessSerialNumber psn;
pid_t pid = pid_val;
int res = GetProcessForPID(pid, &psn);
if (res != 0) {
LOG(LS_ERROR) << "Failed getting process for pid";
result = false;
}
res = SetFrontProcess(&psn);
if (res != 0) {
LOG(LS_ERROR) << "Failed setting process to front";
result = false;
}
}
CFRelease(window_id_array);
CFRelease(window_array);
return result;
}
bool MacWindowPicker::GetDesktopList(DesktopDescriptionList* descriptions) { bool MacWindowPicker::GetDesktopList(DesktopDescriptionList* descriptions) {
const uint32_t kMaxDisplays = 128; const uint32_t kMaxDisplays = 128;

6
webrtc/base/proxydetect.cc
View File

@ -1170,9 +1170,6 @@ bool GetMacProxySettings(ProxyInfo* proxy) {
result = p_putPasswordInProxyInfo(proxy); result = p_putPasswordInProxyInfo(proxy);
} }
// We created the dictionary with something that had the
// word 'copy' in it, so we have to release it, according
// to the Carbon memory management standards.
CFRelease(proxyDict); CFRelease(proxyDict);
} else { } else {
LOG(LS_ERROR) << "SCDynamicStoreCopyProxies failed"; LOG(LS_ERROR) << "SCDynamicStoreCopyProxies failed";
@ -1223,9 +1220,6 @@ bool GetiOSProxySettings(ProxyInfo* proxy) {
result = true; result = true;
} }
// We created the dictionary with something that had the
// word 'copy' in it, so we have to release it, according
// to the Carbon memory management standards.
CFRelease(proxy_dict); CFRelease(proxy_dict);
return result; return result;

51
webrtc/base/unixfilesystem.cc
View File

@ -17,7 +17,7 @@
#include <unistd.h> #include <unistd.h>
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <Carbon/Carbon.h> #include <CoreServices/CoreServices.h>
#include <IOKit/IOCFBundle.h> #include <IOKit/IOCFBundle.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
#include "webrtc/base/macutils.h" #include "webrtc/base/macutils.h"
@ -50,13 +50,13 @@
#include "webrtc/base/stream.h" #include "webrtc/base/stream.h"
#include "webrtc/base/stringutils.h" #include "webrtc/base/stringutils.h"
#if defined(WEBRTC_IOS) #if defined(WEBRTC_MAC)
// Defined in iosfilesystem.mm. No header file to discourage use // Defined in applefilesystem.mm. No header file to discourage use
// elsewhere; other places should use GetApp{Data,Temp}Folder() in // elsewhere; other places should use GetApp{Data,Temp}Folder() in
// this file. Don't copy/paste. I mean it. // this file. Don't copy/paste. I mean it.
char* IOSDataDirectory(); char* AppleDataDirectory();
char* IOSTempDirectory(); char* AppleTempDirectory();
void IOSAppName(rtc::Pathname* path); void AppleAppName(rtc::Pathname* path);
#endif #endif
namespace rtc { namespace rtc {
@ -81,9 +81,9 @@ void UnixFilesystem::SetAppTempFolder(const std::string& folder) {
UnixFilesystem::UnixFilesystem() { UnixFilesystem::UnixFilesystem() {
#if defined(WEBRTC_IOS) #if defined(WEBRTC_IOS)
if (!provided_app_data_folder_) if (!provided_app_data_folder_)
provided_app_data_folder_ = IOSDataDirectory(); provided_app_data_folder_ = AppleDataDirectory();
if (!provided_app_temp_folder_) if (!provided_app_temp_folder_)
provided_app_temp_folder_ = IOSTempDirectory(); provided_app_temp_folder_ = AppleTempDirectory();
#endif #endif
} }
@ -171,19 +171,10 @@ bool UnixFilesystem::DeleteEmptyFolder(const Pathname &folder) {
bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create, bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create,
const std::string *append) { const std::string *append) {
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
FSRef fr;
if (0 != FSFindFolder(kOnAppropriateDisk, kTemporaryFolderType,
kCreateFolder, &fr))
return false;
unsigned char buffer[NAME_MAX+1];
if (0 != FSRefMakePath(&fr, buffer, arraysize(buffer)))
return false;
pathname.SetPathname(reinterpret_cast<char*>(buffer), "");
#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
ASSERT(provided_app_temp_folder_ != NULL); ASSERT(provided_app_temp_folder_ != NULL);
pathname.SetPathname(provided_app_temp_folder_, ""); pathname.SetPathname(provided_app_temp_folder_, "");
#else // !WEBRTC_MAC || WEBRTC_IOS && !WEBRTC_ANDROID #else
if (const char* tmpdir = getenv("TMPDIR")) { if (const char* tmpdir = getenv("TMPDIR")) {
pathname.SetPathname(tmpdir, ""); pathname.SetPathname(tmpdir, "");
} else if (const char* tmp = getenv("TMP")) { } else if (const char* tmp = getenv("TMP")) {
@ -195,7 +186,7 @@ bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create,
pathname.SetPathname("/tmp/", ""); pathname.SetPathname("/tmp/", "");
#endif // !P_tmpdir #endif // !P_tmpdir
} }
#endif // !WEBRTC_MAC || WEBRTC_IOS && !WEBRTC_ANDROID #endif // defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
if (append) { if (append) {
ASSERT(!append->empty()); ASSERT(!append->empty());
pathname.AppendFolder(*append); pathname.AppendFolder(*append);
@ -357,24 +348,10 @@ bool UnixFilesystem::GetFileTime(const Pathname& path, FileTimeType which,
} }
bool UnixFilesystem::GetAppPathname(Pathname* path) { bool UnixFilesystem::GetAppPathname(Pathname* path) {
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #if defined(__native_client__)
ProcessSerialNumber psn = { 0, kCurrentProcess };
CFDictionaryRef procinfo = ProcessInformationCopyDictionary(&psn,
kProcessDictionaryIncludeAllInformationMask);
if (NULL == procinfo)
return false; return false;
CFStringRef cfpath = (CFStringRef) CFDictionaryGetValue(procinfo, #elif defined(WEBRTC_MAC)
kIOBundleExecutableKey); AppleAppName(path);
std::string path8;
bool success = ToUtf8(cfpath, &path8);
CFRelease(procinfo);
if (success)
path->SetPathname(path8);
return success;
#elif defined(__native_client__)
return false;
#elif WEBRTC_IOS
IOSAppName(path);
return true; return true;
#else // WEBRTC_MAC && !defined(WEBRTC_IOS) #else // WEBRTC_MAC && !defined(WEBRTC_IOS)
char buffer[PATH_MAX + 2]; char buffer[PATH_MAX + 2];

1
webrtc/engine_configurations.h
View File

@ -60,7 +60,6 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
// #define CARBON_RENDERING
#define COCOA_RENDERING #define COCOA_RENDERING
#endif #endif

11
webrtc/media/BUILD.gn
View File

@ -186,17 +186,6 @@ rtc_source_set("rtc_media") {
"strmiids.lib", "strmiids.lib",
] ]
} }
if (is_mac && current_cpu == "x86") {
sources += [
"devices/carbonvideorenderer.cc",
"devices/carbonvideorenderer.h",
]
libs += [ "Carbon.framework" ]
}
if (is_ios || (is_mac && current_cpu != "x86")) {
defines += [ "CARBON_DEPRECATED=YES" ]
}
deps += [ deps += [
"..:webrtc_common", "..:webrtc_common",
"../api:call_api", "../api:call_api",

173
webrtc/media/devices/carbonvideorenderer.cc
View File

@ -1,173 +0,0 @@
/*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
// Implementation of CarbonVideoRenderer
#include "webrtc/media/devices/carbonvideorenderer.h"
#include "webrtc/base/logging.h"
#include "webrtc/media/base/videocommon.h"
#include "webrtc/media/base/videoframe.h"
namespace cricket {
CarbonVideoRenderer::CarbonVideoRenderer(int x, int y)
: image_width_(0),
image_height_(0),
x_(x),
y_(y),
window_ref_(NULL) {
}
CarbonVideoRenderer::~CarbonVideoRenderer() {
if (window_ref_) {
DisposeWindow(window_ref_);
}
}
// Called from the main event loop. All renderering needs to happen on
// the main thread.
OSStatus CarbonVideoRenderer::DrawEventHandler(EventHandlerCallRef handler,
EventRef event,
void* data) {
OSStatus status = noErr;
CarbonVideoRenderer* renderer = static_cast<CarbonVideoRenderer*>(data);
if (renderer != NULL) {
if (!renderer->DrawFrame()) {
LOG(LS_ERROR) << "Failed to draw frame.";
}
}
return status;
}
bool CarbonVideoRenderer::DrawFrame() {
// Grab the image lock to make sure it is not changed why we'll draw it.
rtc::CritScope cs(&image_crit_);
if (image_.get() == NULL) {
// Nothing to draw, just return.
return true;
}
int width = image_width_;
int height = image_height_;
CGDataProviderRef provider =
CGDataProviderCreateWithData(NULL, image_.get(), width * height * 4,
NULL);
CGColorSpaceRef color_space_ref = CGColorSpaceCreateDeviceRGB();
CGBitmapInfo bitmap_info = kCGBitmapByteOrderDefault;
CGColorRenderingIntent rendering_intent = kCGRenderingIntentDefault;
CGImageRef image_ref = CGImageCreate(width, height, 8, 32, width * 4,
color_space_ref, bitmap_info, provider,
NULL, false, rendering_intent);
CGDataProviderRelease(provider);
if (image_ref == NULL) {
return false;
}
CGContextRef context;
SetPortWindowPort(window_ref_);
if (QDBeginCGContext(GetWindowPort(window_ref_), &context) != noErr) {
CGImageRelease(image_ref);
return false;
}
Rect window_bounds;
GetWindowPortBounds(window_ref_, &window_bounds);
// Anchor the image to the top left corner.
int x = 0;
int y = window_bounds.bottom - CGImageGetHeight(image_ref);
CGRect dst_rect = CGRectMake(x, y, CGImageGetWidth(image_ref),
CGImageGetHeight(image_ref));
CGContextDrawImage(context, dst_rect, image_ref);
CGContextFlush(context);
QDEndCGContext(GetWindowPort(window_ref_), &context);
CGImageRelease(image_ref);
return true;
}
bool CarbonVideoRenderer::SetSize(int width, int height) {
if (width != image_width_ || height != image_height_) {
// Grab the image lock while changing its size.
rtc::CritScope cs(&image_crit_);
image_width_ = width;
image_height_ = height;
image_.reset(new uint8_t[width * height * 4]);
memset(image_.get(), 255, width * height * 4);
}
return true;
}
void CarbonVideoRenderer::OnFrame(const VideoFrame& video_frame) {
{
const cricket::WebRtcVideoFrame frame(
webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
video_frame.rotation()),
webrtc::kVideoRotation_0, video_frame.timestamp_us());
if (!SetSize(frame.width(), frame.height())) {
return false;
}
// Grab the image lock so we are not trashing up the image being drawn.
rtc::CritScope cs(&image_crit_);
frame.ConvertToRgbBuffer(cricket::FOURCC_ABGR,
image_.get(),
static_cast<size_t>(frame.width()) *
frame.height() * 4,
frame.width() * 4);
}
// Trigger a repaint event for the whole window.
Rect bounds;
InvalWindowRect(window_ref_, GetWindowPortBounds(window_ref_, &bounds));
return true;
}
bool CarbonVideoRenderer::Initialize() {
OSStatus err;
WindowAttributes attributes =
kWindowStandardDocumentAttributes |
kWindowLiveResizeAttribute |
kWindowFrameworkScaledAttribute |
kWindowStandardHandlerAttribute;
struct Rect bounds;
bounds.top = y_;
bounds.bottom = 480;
bounds.left = x_;
bounds.right = 640;
err = CreateNewWindow(kDocumentWindowClass, attributes,
&bounds, &window_ref_);
if (!window_ref_ || err != noErr) {
LOG(LS_ERROR) << "CreateNewWindow failed, error code: " << err;
return false;
}
static const EventTypeSpec event_spec = {
kEventClassWindow,
kEventWindowDrawContent
};
err = InstallWindowEventHandler(
window_ref_,
NewEventHandlerUPP(CarbonVideoRenderer::DrawEventHandler),
GetEventTypeCount(event_spec),
&event_spec,
this,
NULL);
if (err != noErr) {
LOG(LS_ERROR) << "Failed to install event handler, error code: " << err;
return false;
}
SelectWindow(window_ref_);
ShowWindow(window_ref_);
return true;
}
} // namespace cricket

56
webrtc/media/devices/carbonvideorenderer.h
View File

@ -1,56 +0,0 @@
/*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
// Definition of class CarbonVideoRenderer that implements the abstract class
// cricket::VideoRenderer via Carbon.
#ifndef WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
#define WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
#include <memory>
#include <Carbon/Carbon.h>
#include "webrtc/base/criticalsection.h"
#include "webrtc/media/base/videosinkinterface.h"
namespace cricket {
class CarbonVideoRenderer
: public rtc::VideoSinkInterface<cricket::VideoFrame> {
public:
CarbonVideoRenderer(int x, int y);
virtual ~CarbonVideoRenderer();
// Implementation of VideoSinkInterface.
void OnFrame(const VideoFrame& frame) override;
// Needs to be called on the main thread.
bool Initialize();
private:
bool SetSize(int width, int height);
bool DrawFrame();
static OSStatus DrawEventHandler(EventHandlerCallRef handler,
EventRef event,
void* data);
std::unique_ptr<uint8_t[]> image_;
rtc::CriticalSection image_crit_;
int image_width_;
int image_height_;
int x_;
int y_;
WindowRef window_ref_;
};
} // namespace cricket
#endif // WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_

12
webrtc/media/devices/videorendererfactory.h
View File

@ -17,8 +17,6 @@
#include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosinkinterface.h"
#if defined(WEBRTC_LINUX) && defined(HAVE_GTK) #if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
#include "webrtc/media/devices/gtkvideorenderer.h" #include "webrtc/media/devices/gtkvideorenderer.h"
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && !defined(CARBON_DEPRECATED)
#include "webrtc/media/devices/carbonvideorenderer.h"
#elif defined(WIN32) #elif defined(WIN32)
#include "webrtc/media/devices/gdivideorenderer.h" #include "webrtc/media/devices/gdivideorenderer.h"
#endif #endif
@ -32,16 +30,6 @@ class VideoRendererFactory {
int y) { int y) {
#if defined(WEBRTC_LINUX) && defined(HAVE_GTK) #if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
return new GtkVideoRenderer(x, y); return new GtkVideoRenderer(x, y);
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && \
!defined(CARBON_DEPRECATED)
CarbonVideoRenderer* renderer = new CarbonVideoRenderer(x, y);
// Needs to be initialized on the main thread.
if (renderer->Initialize()) {
return renderer;
} else {
delete renderer;
return NULL;
}
#elif defined(WIN32) #elif defined(WIN32)
return new GdiVideoRenderer(x, y); return new GdiVideoRenderer(x, y);
#else #else

18
webrtc/media/media.gyp
View File

@ -173,24 +173,6 @@
}, },
}, },
}], }],
['OS=="mac" and target_arch=="ia32"', {
'sources': [
'devices/carbonvideorenderer.cc',
'devices/carbonvideorenderer.h',
],
'link_settings': {
'xcode_settings': {
'OTHER_LDFLAGS': [
'-framework Carbon',
],
},
},
}],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'defines': [
'CARBON_DEPRECATED=YES',
],
}],
], ],
}, # target rtc_media }, # target rtc_media
], # targets. ], # targets.

3
webrtc/modules/desktop_capture/mac/desktop_configuration.h
View File

@ -12,7 +12,6 @@
#define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_ #define WEBRTC_MODULES_DESKTOP_CAPTURE_MAC_DESKTOP_CONFIGURATION_H_
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#include <Carbon/Carbon.h>
#include <vector> #include <vector>
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
@ -49,7 +48,7 @@ struct MacDesktopConfiguration {
// Returns the desktop & display configurations in Cocoa-style "bottom-up" // Returns the desktop & display configurations in Cocoa-style "bottom-up"
// (the origin is the bottom-left of the primary monitor, and coordinates // (the origin is the bottom-left of the primary monitor, and coordinates
// increase as you move up the screen) or Carbon-style "top-down" coordinates. // increase as you move up the screen).
static MacDesktopConfiguration GetCurrent(Origin origin); static MacDesktopConfiguration GetCurrent(Origin origin);
// Returns true if the given desktop configuration equals this one. // Returns true if the given desktop configuration equals this one.

10
webrtc/webrtc_tests.gypi
View File

@ -165,11 +165,6 @@
'base/sslstreamadapter_unittest.cc', 'base/sslstreamadapter_unittest.cc',
], ],
}], }],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'defines': [
'CARBON_DEPRECATED=YES',
],
}],
['use_quic==1', { ['use_quic==1', {
'sources': [ 'sources': [
'p2p/quic/quicconnectionhelper_unittest.cc', 'p2p/quic/quicconnectionhelper_unittest.cc',
@ -503,11 +498,6 @@
'base/macsocketserver_unittest.cc', 'base/macsocketserver_unittest.cc',
], ],
}], }],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'defines': [
'CARBON_DEPRECATED=YES',
],
}],
], ],
}, },
], ],