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

Side by Side 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: Fix constant declaration issue. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/capture/video_capture_proxy.h" 5 #include "media/video/capture/video_capture_proxy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 10
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 FROM_HERE, 84 FROM_HERE,
85 base::Bind(&VideoCaptureHandlerProxy::OnFrameReadyOnMainThread, 85 base::Bind(&VideoCaptureHandlerProxy::OnFrameReadyOnMainThread,
86 base::Unretained(this), 86 base::Unretained(this),
87 capture, 87 capture,
88 GetState(capture), 88 GetState(capture),
89 frame)); 89 frame));
90 } 90 }
91 91
92 void VideoCaptureHandlerProxy::OnDeviceInfoReceived( 92 void VideoCaptureHandlerProxy::OnDeviceInfoReceived(
93 VideoCapture* capture, 93 VideoCapture* capture,
94 const VideoCaptureParams& device_info) { 94 const VideoCaptureFormat& device_info) {
95 main_message_loop_->PostTask(FROM_HERE, base::Bind( 95 main_message_loop_->PostTask(FROM_HERE, base::Bind(
96 &VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread, 96 &VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread,
97 base::Unretained(this), 97 base::Unretained(this),
98 capture, 98 capture,
99 GetState(capture), 99 GetState(capture),
100 device_info)); 100 device_info));
101 } 101 }
102 102
103 void VideoCaptureHandlerProxy::OnStartedOnMainThread( 103 void VideoCaptureHandlerProxy::OnStartedOnMainThread(
104 VideoCapture* capture, 104 VideoCapture* capture,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 VideoCapture* capture, 140 VideoCapture* capture,
141 const VideoCaptureState& state, 141 const VideoCaptureState& state,
142 const scoped_refptr<VideoFrame>& frame) { 142 const scoped_refptr<VideoFrame>& frame) {
143 state_ = state; 143 state_ = state;
144 proxied_->OnFrameReady(capture, frame); 144 proxied_->OnFrameReady(capture, frame);
145 } 145 }
146 146
147 void VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread( 147 void VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread(
148 VideoCapture* capture, 148 VideoCapture* capture,
149 const VideoCaptureState& state, 149 const VideoCaptureState& state,
150 const VideoCaptureParams& device_info) { 150 const VideoCaptureFormat& device_info) {
151 state_ = state; 151 state_ = state;
152 proxied_->OnDeviceInfoReceived(capture, device_info); 152 proxied_->OnDeviceInfoReceived(capture, device_info);
153 } 153 }
154 154
155 } // namespace media 155 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698