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

Side by Side Diff: webrtc/media/devices/videorendererfactory.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « webrtc/media/devices/v4llookup.cc ('k') | webrtc/media/devices/win32deviceinfo.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 // 28 //
29 // A factory to create a GUI video renderer. 29 // A factory to create a GUI video renderer.
30 30
31 #ifndef TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_ 31 #ifndef WEBRTC_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_
32 #define TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_ 32 #define WEBRTC_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_
33 33
34 #include "talk/media/base/videorenderer.h" 34 #include "webrtc/media/base/videorenderer.h"
35 #if defined(WEBRTC_LINUX) && defined(HAVE_GTK) 35 #if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
36 #include "talk/media/devices/gtkvideorenderer.h" 36 #include "webrtc/media/devices/gtkvideorenderer.h"
37 #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && !defined(CARBON_DEPRECATED) 37 #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && !defined(CARBON_DEPRECATED)
38 #include "talk/media/devices/carbonvideorenderer.h" 38 #include "webrtc/media/devices/carbonvideorenderer.h"
39 #elif defined(WIN32) 39 #elif defined(WIN32)
40 #include "talk/media/devices/gdivideorenderer.h" 40 #include "webrtc/media/devices/gdivideorenderer.h"
41 #endif 41 #endif
42 42
43 namespace cricket { 43 namespace cricket {
44 44
45 class VideoRendererFactory { 45 class VideoRendererFactory {
46 public: 46 public:
47 static VideoRenderer* CreateGuiVideoRenderer(int x, int y) { 47 static VideoRenderer* CreateGuiVideoRenderer(int x, int y) {
48 #if defined(WEBRTC_LINUX) && defined(HAVE_GTK) 48 #if defined(WEBRTC_LINUX) && defined(HAVE_GTK)
49 return new GtkVideoRenderer(x, y); 49 return new GtkVideoRenderer(x, y);
50 #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && \ 50 #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) && \
51 !defined(CARBON_DEPRECATED) 51 !defined(CARBON_DEPRECATED)
52 CarbonVideoRenderer* renderer = new CarbonVideoRenderer(x, y); 52 CarbonVideoRenderer* renderer = new CarbonVideoRenderer(x, y);
53 // Needs to be initialized on the main thread. 53 // Needs to be initialized on the main thread.
54 if (renderer->Initialize()) { 54 if (renderer->Initialize()) {
55 return renderer; 55 return renderer;
56 } else { 56 } else {
57 delete renderer; 57 delete renderer;
58 return NULL; 58 return NULL;
59 } 59 }
60 #elif defined(WIN32) 60 #elif defined(WIN32)
61 return new GdiVideoRenderer(x, y); 61 return new GdiVideoRenderer(x, y);
62 #else 62 #else
63 return NULL; 63 return NULL;
64 #endif 64 #endif
65 } 65 }
66 }; 66 };
67 67
68 } // namespace cricket 68 } // namespace cricket
69 69
70 #endif // TALK_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_ 70 #endif // WEBRTC_MEDIA_DEVICES_VIDEORENDERERFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/media/devices/v4llookup.cc ('k') | webrtc/media/devices/win32deviceinfo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698