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

Unified Diff: trunk/src/content/browser/renderer_host/media/video_capture_controller.cc

Issue 61213006: Revert 235728 "Removed RunUntilIdle between Stop and Close in UT..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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: 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) {

Powered by Google App Engine
This is Rietveld 408576698