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

Unified Diff: media/video/capture/video_capture_proxy.cc

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes from bbudge 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
« no previous file with comments | « media/video/capture/video_capture_proxy.h ('k') | media/video/capture/video_capture_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/video_capture_proxy.cc
diff --git a/media/video/capture/video_capture_proxy.cc b/media/video/capture/video_capture_proxy.cc
index 3adbb7ce3b269ce08f7d1bc4dde4d1627b8b7eff..bbbd6108fcaa1cf9e5a20b553ffa07ee49e542f5 100644
--- a/media/video/capture/video_capture_proxy.cc
+++ b/media/video/capture/video_capture_proxy.cc
@@ -16,8 +16,6 @@ media::VideoCaptureHandlerProxy::VideoCaptureState GetState(
media::VideoCapture* capture) {
media::VideoCaptureHandlerProxy::VideoCaptureState state;
state.started = capture->CaptureStarted();
- state.width = capture->CaptureWidth();
- state.height = capture->CaptureHeight();
state.frame_rate = capture->CaptureFrameRate();
return state;
}
@@ -89,17 +87,6 @@ void VideoCaptureHandlerProxy::OnFrameReady(
frame));
}
-void VideoCaptureHandlerProxy::OnDeviceInfoReceived(
- VideoCapture* capture,
- const VideoCaptureParams& device_info) {
- main_message_loop_->PostTask(FROM_HERE, base::Bind(
- &VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread,
- base::Unretained(this),
- capture,
- GetState(capture),
- device_info));
-}
-
void VideoCaptureHandlerProxy::OnStartedOnMainThread(
VideoCapture* capture,
const VideoCaptureState& state) {
@@ -144,12 +131,4 @@ void VideoCaptureHandlerProxy::OnFrameReadyOnMainThread(
proxied_->OnFrameReady(capture, frame);
}
-void VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread(
- VideoCapture* capture,
- const VideoCaptureState& state,
- const VideoCaptureParams& device_info) {
- state_ = state;
- proxied_->OnDeviceInfoReceived(capture, device_info);
-}
-
} // namespace media
« no previous file with comments | « media/video/capture/video_capture_proxy.h ('k') | media/video/capture/video_capture_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698