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

Side by Side Diff: webrtc/media/devices/gdivideorenderer.cc

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/gdivideorenderer.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('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 2004 Google Inc. 3 * Copyright 2004 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 11 matching lines...) Expand all
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 // Implementation of GdiVideoRenderer on Windows 28 // Implementation of GdiVideoRenderer on Windows
29 29
30 #ifdef WIN32 30 #ifdef WIN32
31 31
32 #include "talk/media/devices/gdivideorenderer.h" 32 #include "webrtc/media/devices/gdivideorenderer.h"
33 33
34 #include "talk/media/base/videocommon.h"
35 #include "talk/media/base/videoframe.h"
36 #include "webrtc/base/scoped_ptr.h" 34 #include "webrtc/base/scoped_ptr.h"
37 #include "webrtc/base/thread.h" 35 #include "webrtc/base/thread.h"
38 #include "webrtc/base/win32window.h" 36 #include "webrtc/base/win32window.h"
37 #include "webrtc/media/base/videocommon.h"
38 #include "webrtc/media/base/videoframe.h"
39 39
40 namespace cricket { 40 namespace cricket {
41 41
42 ///////////////////////////////////////////////////////////////////////////// 42 /////////////////////////////////////////////////////////////////////////////
43 // Definition of private class VideoWindow. We use a worker thread to manage 43 // Definition of private class VideoWindow. We use a worker thread to manage
44 // the window. 44 // the window.
45 ///////////////////////////////////////////////////////////////////////////// 45 /////////////////////////////////////////////////////////////////////////////
46 class GdiVideoRenderer::VideoWindow : public rtc::Win32Window { 46 class GdiVideoRenderer::VideoWindow : public rtc::Win32Window {
47 public: 47 public:
48 VideoWindow(int x, int y, int width, int height); 48 VideoWindow(int x, int y, int width, int height);
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 bool GdiVideoRenderer::RenderFrame(const VideoFrame* frame) { 271 bool GdiVideoRenderer::RenderFrame(const VideoFrame* frame) {
272 if (!frame || !window_.get()) { 272 if (!frame || !window_.get()) {
273 return false; 273 return false;
274 } 274 }
275 return window_->RenderFrame(frame); 275 return window_->RenderFrame(frame);
276 } 276 }
277 277
278 } // namespace cricket 278 } // namespace cricket
279 #endif // WIN32 279 #endif // WIN32
OLDNEW
« no previous file with comments | « webrtc/media/devices/gdivideorenderer.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698