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

Unified Diff: webrtc/media/devices/videorendererfactory.h

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: Created 4 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/devices/carbonvideorenderer.cc ('k') | webrtc/media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/videorendererfactory.h
diff --git a/webrtc/media/devices/videorendererfactory.h b/webrtc/media/devices/videorendererfactory.h
index bdc56861e84f1dfe377821b1dee921afb5388dbf..0bacdbd09aa53cede86857123ddde10de36de2a8 100644
--- a/webrtc/media/devices/videorendererfactory.h
+++ b/webrtc/media/devices/videorendererfactory.h
@@ -17,6 +17,8 @@
#include "webrtc/media/base/videosinkinterface.h"
#if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
#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)
#include "webrtc/media/devices/gdivideorenderer.h"
#endif
@@ -30,6 +32,16 @@
int y) {
#if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
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)
return new GdiVideoRenderer(x, y);
#else
« no previous file with comments | « webrtc/media/devices/carbonvideorenderer.cc ('k') | webrtc/media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698