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

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

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: 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/fakedevicemanager.h ('k') | webrtc/media/devices/gdivideorenderer.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 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 // 11 //
12 // Definition of class GdiVideoRenderer that implements the abstract class 12 // Definition of class GdiVideoRenderer that implements the abstract class
13 // cricket::VideoRenderer via GDI on Windows. 13 // cricket::VideoRenderer via GDI on Windows.
14 14
15 #ifndef WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ 15 #ifndef WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_
16 #define WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ 16 #define WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_
17 #ifdef WIN32
17 18
18 #ifdef WIN32 19 #include <memory>
19 #include "webrtc/base/scoped_ptr.h" 20
20 #include "webrtc/media/base/videorenderer.h" 21 #include "webrtc/media/base/videorenderer.h"
21 22
22 namespace cricket { 23 namespace cricket {
23 24
24 class GdiVideoRenderer : public VideoRenderer { 25 class GdiVideoRenderer : public VideoRenderer {
25 public: 26 public:
26 GdiVideoRenderer(int x, int y); 27 GdiVideoRenderer(int x, int y);
27 virtual ~GdiVideoRenderer(); 28 virtual ~GdiVideoRenderer();
28 29
29 // Implementation of pure virtual methods of VideoRenderer. 30 // Implementation of pure virtual methods of VideoRenderer.
30 // These two methods may be executed in different threads. 31 // These two methods may be executed in different threads.
31 // SetSize is called before RenderFrame. 32 // SetSize is called before RenderFrame.
32 virtual bool SetSize(int width, int height, int reserved); 33 virtual bool SetSize(int width, int height, int reserved);
33 virtual bool RenderFrame(const VideoFrame* frame); 34 virtual bool RenderFrame(const VideoFrame* frame);
34 35
35 private: 36 private:
36 class VideoWindow; // forward declaration, defined in the .cc file 37 class VideoWindow; // forward declaration, defined in the .cc file
37 rtc::scoped_ptr<VideoWindow> window_; 38 std::unique_ptr<VideoWindow> window_;
38 // The initial position of the window. 39 // The initial position of the window.
39 int initial_x_; 40 int initial_x_;
40 int initial_y_; 41 int initial_y_;
41 }; 42 };
42 43
43 } // namespace cricket 44 } // namespace cricket
44 45
45 #endif // WIN32 46 #endif // WIN32
46 #endif // WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ 47 #endif // WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_
OLDNEW
« no previous file with comments | « webrtc/media/devices/fakedevicemanager.h ('k') | webrtc/media/devices/gdivideorenderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698