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

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

Issue 9389006: Changed VideoCaptureController to use correct session id when stopping the capture device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright year Created 8 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_controller.cc
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index c185dbec7618a8ed4cac940e601cdbc80e55cac7..dc1609b28af256691b7f906481d08f040767a1d7 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -190,12 +190,13 @@ void VideoCaptureController::StopCapture(
client->event_handler->OnReadyToDelete(client->controller_id);
}
+ int session_id = client->parameters.session_id;
delete client;
controller_clients_.remove(client);
// No more clients. Stop device.
if (controller_clients_.empty()) {
- video_capture_manager_->Stop(current_params_.session_id,
+ video_capture_manager_->Stop(session_id,
base::Bind(&VideoCaptureController::OnDeviceStopped, this));
frame_info_available_ = false;
state_ = video_capture::kStopping;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698