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

Side by Side Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.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 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 CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 22 matching lines...) Expand all
33 33
34 // OnFrameCaptured delivers video frames to libjingle. It must be called on 34 // OnFrameCaptured delivers video frames to libjingle. It must be called on
35 // libjingles worker thread. 35 // libjingles worker thread.
36 // This method is virtual for testing purposes. 36 // This method is virtual for testing purposes.
37 virtual void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame); 37 virtual void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame);
38 38
39 private: 39 private:
40 // cricket::VideoCapturer implementation. 40 // cricket::VideoCapturer implementation.
41 // These methods are accessed from a libJingle worker thread. 41 // These methods are accessed from a libJingle worker thread.
42 virtual cricket::CaptureState Start( 42 virtual cricket::CaptureState Start(
43 const cricket::VideoFormat& capture_format) OVERRIDE; 43 const cricket::VideoFormat& capture_format) override;
44 virtual void Stop() OVERRIDE; 44 virtual void Stop() override;
45 virtual bool IsRunning() OVERRIDE; 45 virtual bool IsRunning() override;
46 virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE; 46 virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) override;
47 virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired, 47 virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired,
48 cricket::VideoFormat* best_format) OVERRIDE; 48 cricket::VideoFormat* best_format) override;
49 virtual bool IsScreencast() const OVERRIDE; 49 virtual bool IsScreencast() const override;
50 50
51 void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src); 51 void UpdateI420Buffer(const scoped_refptr<media::VideoFrame>& src);
52 52
53 // |thread_checker_| is bound to the libjingle worker thread. 53 // |thread_checker_| is bound to the libjingle worker thread.
54 base::ThreadChecker thread_checker_; 54 base::ThreadChecker thread_checker_;
55 55
56 const bool is_screencast_; 56 const bool is_screencast_;
57 bool running_; 57 bool running_;
58 base::TimeDelta first_frame_timestamp_; 58 base::TimeDelta first_frame_timestamp_;
59 // |buffer_| used if cropping is needed. It is created only if needed and 59 // |buffer_| used if cropping is needed. It is created only if needed and
60 // owned by WebRtcVideoCapturerAdapter. If its created, it exists until 60 // owned by WebRtcVideoCapturerAdapter. If its created, it exists until
61 // WebRtcVideoCapturerAdapter is destroyed. 61 // WebRtcVideoCapturerAdapter is destroyed.
62 uint8* buffer_; 62 uint8* buffer_;
63 size_t buffer_size_; 63 size_t buffer_size_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(WebRtcVideoCapturerAdapter); 65 DISALLOW_COPY_AND_ASSIGN(WebRtcVideoCapturerAdapter);
66 }; 66 };
67 67
68 } // namespace content 68 } // namespace content
69 69
70 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_ 70 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_WEBRTC_VIDEO_CAPTURER_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698