| Index: trunk/src/content/browser/renderer_host/media/video_capture_controller.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/renderer_host/media/video_capture_controller.cc (revision 235779)
|
| +++ trunk/src/content/browser/renderer_host/media/video_capture_controller.cc (working copy)
|
| @@ -153,10 +153,6 @@
|
| << ", " << params.session_id
|
| << ")";
|
|
|
| - // If this is the first client added to the controller, cache the parameters.
|
| - if (!controller_clients_.size())
|
| - video_capture_format_ = params.requested_format;
|
| -
|
| // Signal error in case device is already in error state.
|
| if (state_ == VIDEO_CAPTURE_STATE_ERROR) {
|
| event_handler->OnError(id);
|
| @@ -233,12 +229,6 @@
|
| buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
|
| }
|
|
|
| -const media::VideoCaptureFormat&
|
| -VideoCaptureController::GetVideoCaptureFormat() const {
|
| - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| - return video_capture_format_;
|
| -}
|
| -
|
| scoped_refptr<media::VideoFrame>
|
| VideoCaptureController::VideoCaptureDeviceClient::ReserveOutputBuffer(
|
| const gfx::Size& size) {
|
|
|