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

Side by Side Diff: remoting/client/software_video_renderer.h

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 | « remoting/client/plugin/pepper_view.h ('k') | remoting/client/software_video_renderer.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 // 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 "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "remoting/client/chromoting_stats.h" 10 #include "remoting/client/chromoting_stats.h"
(...skipping 24 matching lines...) Expand all
35 // receiving and queueing packets. The |decode_task_runner_| is responsible 35 // receiving and queueing packets. The |decode_task_runner_| is responsible
36 // for decoding the video packets. 36 // for decoding the video packets.
37 // TODO(wez): Replace the ref-counted proxy with an owned FrameConsumer. 37 // TODO(wez): Replace the ref-counted proxy with an owned FrameConsumer.
38 SoftwareVideoRenderer( 38 SoftwareVideoRenderer(
39 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 39 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
40 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner, 40 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner,
41 scoped_refptr<FrameConsumerProxy> consumer); 41 scoped_refptr<FrameConsumerProxy> consumer);
42 virtual ~SoftwareVideoRenderer(); 42 virtual ~SoftwareVideoRenderer();
43 43
44 // VideoRenderer implementation. 44 // VideoRenderer implementation.
45 virtual void Initialize(const protocol::SessionConfig& config) OVERRIDE; 45 virtual void Initialize(const protocol::SessionConfig& config) override;
46 virtual ChromotingStats* GetStats() OVERRIDE; 46 virtual ChromotingStats* GetStats() override;
47 virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, 47 virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
48 const base::Closure& done) OVERRIDE; 48 const base::Closure& done) override;
49 49
50 // FrameProducer implementation. These methods may be called before we are 50 // FrameProducer implementation. These methods may be called before we are
51 // Initialize()d, or we know the source screen size. These methods may be 51 // Initialize()d, or we know the source screen size. These methods may be
52 // called on any thread. 52 // called on any thread.
53 // 53 //
54 // TODO(sergeyu): On Android a separate display thread is used for drawing. 54 // TODO(sergeyu): On Android a separate display thread is used for drawing.
55 // FrameConsumer calls FrameProducer on that thread. Can we avoid having a 55 // FrameConsumer calls FrameProducer on that thread. Can we avoid having a
56 // separate display thread? E.g. can we do everything on the decode thread? 56 // separate display thread? E.g. can we do everything on the decode thread?
57 virtual void DrawBuffer(webrtc::DesktopFrame* buffer) OVERRIDE; 57 virtual void DrawBuffer(webrtc::DesktopFrame* buffer) override;
58 virtual void InvalidateRegion(const webrtc::DesktopRegion& region) OVERRIDE; 58 virtual void InvalidateRegion(const webrtc::DesktopRegion& region) override;
59 virtual void RequestReturnBuffers(const base::Closure& done) OVERRIDE; 59 virtual void RequestReturnBuffers(const base::Closure& done) override;
60 virtual void SetOutputSizeAndClip( 60 virtual void SetOutputSizeAndClip(
61 const webrtc::DesktopSize& view_size, 61 const webrtc::DesktopSize& view_size,
62 const webrtc::DesktopRect& clip_area) OVERRIDE; 62 const webrtc::DesktopRect& clip_area) override;
63 63
64 private: 64 private:
65 class Core; 65 class Core;
66 66
67 // Callback method when a VideoPacket is processed. |decode_start| contains 67 // Callback method when a VideoPacket is processed. |decode_start| contains
68 // the timestamp when the packet will start to be processed. 68 // the timestamp when the packet will start to be processed.
69 void OnPacketDone(base::Time decode_start, const base::Closure& done); 69 void OnPacketDone(base::Time decode_start, const base::Closure& done);
70 70
71 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_; 71 scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner_;
72 scoped_ptr<Core> core_; 72 scoped_ptr<Core> core_;
73 73
74 ChromotingStats stats_; 74 ChromotingStats stats_;
75 75
76 // Keep track of the most recent sequence number bounced back from the host. 76 // Keep track of the most recent sequence number bounced back from the host.
77 int64 latest_sequence_number_; 77 int64 latest_sequence_number_;
78 78
79 base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_; 79 base::WeakPtrFactory<SoftwareVideoRenderer> weak_factory_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer); 81 DISALLOW_COPY_AND_ASSIGN(SoftwareVideoRenderer);
82 }; 82 };
83 83
84 } // namespace remoting 84 } // namespace remoting
85 85
86 #endif // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_ 86 #endif // REMOTING_CLIENT_SOFTWARE_VIDEO_RENDERER_H_
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_view.h ('k') | remoting/client/software_video_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698