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

Unified Diff: webrtc/media/webrtc/webrtcvideocapturer.h

Issue 1687273002: Revert of Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/media.gyp ('k') | webrtc/media/webrtc/webrtcvideocapturer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvideocapturer.h
diff --git a/webrtc/media/webrtc/webrtcvideocapturer.h b/webrtc/media/webrtc/webrtcvideocapturer.h
index 0d5eb3d6df8c2afb60eec37ec143c4ed854854b5..ef4dea48a176a733e3d90dc28987ee030708f2aa 100644
--- a/webrtc/media/webrtc/webrtcvideocapturer.h
+++ b/webrtc/media/webrtc/webrtcvideocapturer.h
@@ -10,6 +10,8 @@
#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+
+#ifdef HAVE_WEBRTC_VIDEO
#include <string>
#include <vector>
@@ -48,15 +50,15 @@
bool Init(webrtc::VideoCaptureModule* module);
// Override virtual methods of the parent class VideoCapturer.
- 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; }
+ 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);
protected:
- void OnSinkWantsChanged(const rtc::VideoSinkWants& wants) override;
// Override virtual methods of the parent class VideoCapturer.
virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs);
@@ -93,4 +95,5 @@
} // namespace cricket
+#endif // HAVE_WEBRTC_VIDEO
#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
« no previous file with comments | « webrtc/media/media.gyp ('k') | webrtc/media/webrtc/webrtcvideocapturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698