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

Side by Side Diff: content/renderer/media/rtc_video_renderer.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 21 matching lines...) Expand all
32 // deo_decoder_unittest.cc?revision=180591&view=markup 32 // deo_decoder_unittest.cc?revision=180591&view=markup
33 class CONTENT_EXPORT RTCVideoRenderer 33 class CONTENT_EXPORT RTCVideoRenderer
34 : NON_EXPORTED_BASE(public VideoFrameProvider), 34 : NON_EXPORTED_BASE(public VideoFrameProvider),
35 NON_EXPORTED_BASE(public MediaStreamVideoSink) { 35 NON_EXPORTED_BASE(public MediaStreamVideoSink) {
36 public: 36 public:
37 RTCVideoRenderer(const blink::WebMediaStreamTrack& video_track, 37 RTCVideoRenderer(const blink::WebMediaStreamTrack& video_track,
38 const base::Closure& error_cb, 38 const base::Closure& error_cb,
39 const RepaintCB& repaint_cb); 39 const RepaintCB& repaint_cb);
40 40
41 // VideoFrameProvider implementation. Called on the main thread. 41 // VideoFrameProvider implementation. Called on the main thread.
42 virtual void Start() OVERRIDE; 42 virtual void Start() override;
43 virtual void Stop() OVERRIDE; 43 virtual void Stop() override;
44 virtual void Play() OVERRIDE; 44 virtual void Play() override;
45 virtual void Pause() OVERRIDE; 45 virtual void Pause() override;
46 46
47 protected: 47 protected:
48 virtual ~RTCVideoRenderer(); 48 virtual ~RTCVideoRenderer();
49 49
50 private: 50 private:
51 enum State { 51 enum State {
52 STARTED, 52 STARTED,
53 PAUSED, 53 PAUSED,
54 STOPPED, 54 STOPPED,
55 }; 55 };
56 56
57 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, 57 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
58 const media::VideoCaptureFormat& format, 58 const media::VideoCaptureFormat& format,
59 const base::TimeTicks& estimated_capture_time); 59 const base::TimeTicks& estimated_capture_time);
60 60
61 // VideoTrackSink implementation. Called on the main thread. 61 // VideoTrackSink implementation. Called on the main thread.
62 virtual void OnReadyStateChanged( 62 virtual void OnReadyStateChanged(
63 blink::WebMediaStreamSource::ReadyState state) OVERRIDE; 63 blink::WebMediaStreamSource::ReadyState state) override;
64 64
65 void RenderSignalingFrame(); 65 void RenderSignalingFrame();
66 66
67 base::Closure error_cb_; 67 base::Closure error_cb_;
68 RepaintCB repaint_cb_; 68 RepaintCB repaint_cb_;
69 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 69 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
70 State state_; 70 State state_;
71 gfx::Size frame_size_; 71 gfx::Size frame_size_;
72 blink::WebMediaStreamTrack video_track_; 72 blink::WebMediaStreamTrack video_track_;
73 base::WeakPtrFactory<RTCVideoRenderer> weak_factory_; 73 base::WeakPtrFactory<RTCVideoRenderer> weak_factory_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(RTCVideoRenderer); 75 DISALLOW_COPY_AND_ASSIGN(RTCVideoRenderer);
76 }; 76 };
77 77
78 } // namespace content 78 } // namespace content
79 79
80 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 80 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_video_encoder_factory.h ('k') | content/renderer/media/user_media_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698