| Index: webrtc/media/webrtc/webrtcvideocapturer.h
|
| diff --git a/webrtc/media/webrtc/webrtcvideocapturer.h b/webrtc/media/webrtc/webrtcvideocapturer.h
|
| index ef4dea48a176a733e3d90dc28987ee030708f2aa..0d5eb3d6df8c2afb60eec37ec143c4ed854854b5 100644
|
| --- a/webrtc/media/webrtc/webrtcvideocapturer.h
|
| +++ b/webrtc/media/webrtc/webrtcvideocapturer.h
|
| @@ -11,8 +11,6 @@
|
| #ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
| #define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
|
|
| -#ifdef HAVE_WEBRTC_VIDEO
|
| -
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -50,15 +48,15 @@ class WebRtcVideoCapturer : public VideoCapturer,
|
| bool Init(webrtc::VideoCaptureModule* module);
|
|
|
| // Override virtual methods of the parent class VideoCapturer.
|
| - virtual bool GetBestCaptureFormat(const VideoFormat& desired,
|
| - VideoFormat* best_format);
|
| - virtual CaptureState Start(const VideoFormat& capture_format);
|
| - virtual void Stop();
|
| - virtual bool IsRunning();
|
| - virtual bool IsScreencast() const { return false; }
|
| - virtual bool SetApplyRotation(bool enable);
|
| + bool GetBestCaptureFormat(const VideoFormat& desired,
|
| + VideoFormat* best_format) override;
|
| + CaptureState Start(const VideoFormat& capture_format) override;
|
| + void Stop() override;
|
| + bool IsRunning() override;
|
| + bool IsScreencast() const override { return false; }
|
|
|
| protected:
|
| + void OnSinkWantsChanged(const rtc::VideoSinkWants& wants) override;
|
| // Override virtual methods of the parent class VideoCapturer.
|
| virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs);
|
|
|
| @@ -95,5 +93,4 @@ struct WebRtcCapturedFrame : public CapturedFrame {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // HAVE_WEBRTC_VIDEO
|
| #endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
|
|