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

Side by Side Diff: remoting/protocol/webrtc_video_renderer_adapter.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
7 7
8 #include <memory>
9
8 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
11 #include "third_party/webrtc/api/mediastreaminterface.h" 12 #include "third_party/webrtc/api/mediastreaminterface.h"
12 #include "third_party/webrtc/media/base/videosinkinterface.h" 13 #include "third_party/webrtc/media/base/videosinkinterface.h"
13 14
14 namespace base { 15 namespace base {
15 class SingleThreadTaskRunner; 16 class SingleThreadTaskRunner;
16 } // namespace base 17 } // namespace base
17 18
18 namespace webrtc { 19 namespace webrtc {
19 class DesktopFrame; 20 class DesktopFrame;
(...skipping 15 matching lines...) Expand all
35 scoped_refptr<webrtc::MediaStreamInterface> media_stream, 36 scoped_refptr<webrtc::MediaStreamInterface> media_stream,
36 FrameConsumer* frame_consumer); 37 FrameConsumer* frame_consumer);
37 ~WebrtcVideoRendererAdapter() override; 38 ~WebrtcVideoRendererAdapter() override;
38 39
39 std::string label() const { return media_stream_->label(); } 40 std::string label() const { return media_stream_->label(); }
40 41
41 // rtc::VideoSinkInterface implementation. 42 // rtc::VideoSinkInterface implementation.
42 void OnFrame(const cricket::VideoFrame& frame) override; 43 void OnFrame(const cricket::VideoFrame& frame) override;
43 44
44 private: 45 private:
45 void DrawFrame(scoped_ptr<webrtc::DesktopFrame> frame); 46 void DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame);
46 47
47 scoped_refptr<webrtc::MediaStreamInterface> media_stream_; 48 scoped_refptr<webrtc::MediaStreamInterface> media_stream_;
48 FrameConsumer* frame_consumer_; 49 FrameConsumer* frame_consumer_;
49 uint32_t output_format_fourcc_; 50 uint32_t output_format_fourcc_;
50 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 51 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
51 52
52 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_; 53 base::WeakPtrFactory<WebrtcVideoRendererAdapter> weak_factory_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter); 55 DISALLOW_COPY_AND_ASSIGN(WebrtcVideoRendererAdapter);
55 }; 56 };
56 57
57 } // namespace remoting 58 } // namespace remoting
58 } // namespace protocol 59 } // namespace protocol
59 60
60 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_ 61 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_RENDERER_ADAPTER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/webrtc_video_capturer_adapter.cc ('k') | remoting/protocol/webrtc_video_renderer_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698