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

Side by Side Diff: remoting/client/software_video_renderer.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CLIENT_SOFTWARE_VIDEO_RENDERER_H_ 5 #ifndef REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
6 #define REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_ 6 #define REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
15 #include "remoting/protocol/performance_tracker.h" 16 #include "remoting/protocol/performance_tracker.h"
16 #include "remoting/protocol/video_renderer.h" 17 #include "remoting/protocol/video_renderer.h"
17 #include "remoting/protocol/video_stub.h" 18 #include "remoting/protocol/video_stub.h"
18 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 19 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
19 20
20 namespace base { 21 namespace base {
21 class SingleThreadTaskRunner; 22 class SingleThreadTaskRunner;
22 } // namespace base 23 } // namespace base
(...skipping 25 matching lines...) Expand all
48 protocol::FrameConsumer* consumer, 49 protocol::FrameConsumer* consumer,
49 protocol::PerformanceTracker* perf_tracker); 50 protocol::PerformanceTracker* perf_tracker);
50 ~SoftwareVideoRenderer() override; 51 ~SoftwareVideoRenderer() override;
51 52
52 // VideoRenderer interface. 53 // VideoRenderer interface.
53 void OnSessionConfig(const protocol::SessionConfig& config) override; 54 void OnSessionConfig(const protocol::SessionConfig& config) override;
54 protocol::VideoStub* GetVideoStub() override; 55 protocol::VideoStub* GetVideoStub() override;
55 protocol::FrameConsumer* GetFrameConsumer() override; 56 protocol::FrameConsumer* GetFrameConsumer() override;
56 57
57 // protocol::VideoStub interface. 58 // protocol::VideoStub interface.
58 void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, 59 void ProcessVideoPacket(std::unique_ptr<VideoPacket> packet,
59 const base::Closure& done) override; 60 const base::Closure& done) override;
60 61
61 private: 62 private:
62 void RenderFrame(int32_t frame_id, 63 void RenderFrame(int32_t frame_id,
63 const base::Closure& done, 64 const base::Closure& done,
64 scoped_ptr<webrtc::DesktopFrame> frame); 65 std::unique_ptr<webrtc::DesktopFrame> frame);
65 void OnFrameRendered(int32_t frame_id, const base::Closure& done); 66 void OnFrameRendered(int32_t frame_id, const base::Closure& done);
66 67
67 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_; 68 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
68 protocol::FrameConsumer* consumer_; 69 protocol::FrameConsumer* consumer_;
69 protocol::PerformanceTracker* perf_tracker_; 70 protocol::PerformanceTracker* perf_tracker_;
70 71
71 scoped_ptr<VideoDecoder> decoder_; 72 std::unique_ptr<VideoDecoder> decoder_;
72 73
73 webrtc::DesktopSize source_size_; 74 webrtc::DesktopSize source_size_;
74 webrtc::DesktopVector source_dpi_; 75 webrtc::DesktopVector source_dpi_;
75 76
76 base::ThreadChecker thread_checker_; 77 base::ThreadChecker thread_checker_;
77 78
78 base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_; 79 base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_;
79 80
80 DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer); 81 DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer);
81 }; 82 };
82 83
83 } // namespace remoting 84 } // namespace remoting
84 85
85 #endif // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_ 86 #endif // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
OLDNEW
« no previous file with comments | « remoting/client/server_log_entry_client_unittest.cc ('k') | remoting/client/software_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698