Close video capture devices on the device thread.

content/browser/renderer_host/media/video_capture_manager.cc

 // Copyright (c) 2011 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.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
+#include <set>
+
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/video_capture_device.h"
 
 using content::BrowserThread;
 
@@ skipping 21 matching lines @@
 
 VideoCaptureManager::VideoCaptureManager()
   : vc_device_thread_("VideoCaptureManagerThread"),
     listener_(NULL),
     new_capture_session_id_(kFirstSessionId),
     use_fake_device_(false) {
   vc_device_thread_.Start();
 }
 
 VideoCaptureManager::~VideoCaptureManager() {
-  vc_device_thread_.Stop();
   // TODO(mflodman) Remove this temporary solution when shut-down issue is
   // resolved, i.e. all code below this comment.
   // Temporary solution: close all open devices and delete them, after the
   // thread is stopped.
   DLOG_IF(ERROR, !devices_.empty()) << "VideoCaptureManager: Open devices!";
-  for (VideoCaptureDevices::iterator it = devices_.begin();
-       it != devices_.end();
-       ++it) {
-    it->second->DeAllocate();
-    delete it->second;
-  }
-  STLDeleteValues(&controllers_);
+  listener_ = NULL;
+  // The devices must be stopped on the device thread to avoid threading issues
+  // in native device code.
+  vc_device_thread_.message_loop()->PostTask(
+      FROM_HERE,
+      base::Bind(&VideoCaptureManager::TerminateOnDeviceThread,
+                 base::Unretained(this)));
+  vc_device_thread_.Stop();
 }
 
 void VideoCaptureManager::Register(MediaStreamProviderListener* listener) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!listener_);
   listener_ = listener;
 }
 
 void VideoCaptureManager::Unregister() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 424 matching lines @@
     OnOpen(capture_session_id, device);
 
     VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
     if (dit != devices_.end()) {
       return dit->second;
     }
   }
   return NULL;
 }
 
+void VideoCaptureManager::TerminateOnDeviceThread() {
+  DCHECK(IsOnCaptureDeviceThread());
+
+  std::set<media::VideoCaptureDevice*> devices_to_delete;
+  for (VideoCaptureDevices::iterator it = devices_.begin();
+       it != devices_.end(); ++it) {
+    it->second->DeAllocate();
+    devices_to_delete.insert(it->second);
+  }
+  STLDeleteElements(&devices_to_delete);
+  STLDeleteValues(&controllers_);
+}
+
 }  // namespace media_stream