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

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

Issue 1655793003: Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed Android Created 4 years, 11 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
Index: talk/media/webrtc/webrtcvideocapturer.h
diff --git a/talk/media/webrtc/webrtcvideocapturer.h b/talk/media/webrtc/webrtcvideocapturer.h
index 591e46f6295ee63d775d24b0f237b841c22b5a20..bdd14d73a35992ab1c9df54fd2bf756f094170d3 100644
--- a/talk/media/webrtc/webrtcvideocapturer.h
+++ b/talk/media/webrtc/webrtcvideocapturer.h
@@ -25,8 +25,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
-#define TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
+#ifndef TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
+#define TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
#ifdef HAVE_WEBRTC_VIDEO
@@ -67,13 +67,14 @@ 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; }
+ void OnSinkCapabilitiesChanged(
+ const rtc::VideoSinkCapabilities& capabilities) override;
protected:
// Override virtual methods of the parent class VideoCapturer.
@@ -113,4 +114,4 @@ struct WebRtcCapturedFrame : public CapturedFrame {
} // namespace cricket
#endif // HAVE_WEBRTC_VIDEO
-#endif // TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
+#endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_

Powered by Google App Engine
This is Rietveld 408576698