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

Unified Diff: content/renderer/media/rtc_video_capture_delegate.cc

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add assert to vcbp unittest Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_video_capture_delegate.cc
diff --git a/content/renderer/media/rtc_video_capture_delegate.cc b/content/renderer/media/rtc_video_capture_delegate.cc
index 8b038d5c75cb441bf202e31710c5c4fc783cdf7d..f904bd3caf93d121e4c1cb648ed91fc03c92b5bd 100644
--- a/content/renderer/media/rtc_video_capture_delegate.cc
+++ b/content/renderer/media/rtc_video_capture_delegate.cc
@@ -26,7 +26,7 @@ RtcVideoCaptureDelegate::~RtcVideoCaptureDelegate() {
}
void RtcVideoCaptureDelegate::StartCapture(
- const media::VideoCaptureCapability& capability,
+ const media::VideoCaptureParams& params,
const FrameCapturedCallback& captured_callback,
const StateChangeCallback& state_callback) {
DVLOG(3) << " RtcVideoCaptureDelegate::StartCapture ";
@@ -39,7 +39,7 @@ void RtcVideoCaptureDelegate::StartCapture(
// Increase the reference count to ensure we are not deleted until
// The we are unregistered in RtcVideoCaptureDelegate::OnRemoved.
AddRef();
- capture_engine_->StartCapture(this, capability);
+ capture_engine_->StartCapture(this, params);
}
void RtcVideoCaptureDelegate::StopCapture() {
@@ -94,12 +94,7 @@ void RtcVideoCaptureDelegate::OnFrameReady(
void RtcVideoCaptureDelegate::OnDeviceInfoReceived(
media::VideoCapture* capture,
- const media::VideoCaptureParams& device_info) {
-}
-
-void RtcVideoCaptureDelegate::OnDeviceInfoChanged(
- media::VideoCapture* capture,
- const media::VideoCaptureParams& device_info) {
+ const media::VideoCaptureFormat& device_info) {
}
void RtcVideoCaptureDelegate::OnFrameReadyOnCaptureThread(

Powered by Google App Engine
This is Rietveld 408576698