| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/renderer_host/media/video_capture_manager.h" | 5 #include "content/browser/renderer_host/media/video_capture_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 request->set_abort_start(); | 372 request->set_abort_start(); |
| 373 DVLOG(3) << "DoStopDevice, aborting start request for device " | 373 DVLOG(3) << "DoStopDevice, aborting start request for device " |
| 374 << entry->id << " serial_id = " << entry->serial_id; | 374 << entry->id << " serial_id = " << entry->serial_id; |
| 375 return; | 375 return; |
| 376 } | 376 } |
| 377 } | 377 } |
| 378 | 378 |
| 379 DVLOG(3) << "DoStopDevice. Send stop request for device = " << entry->id | 379 DVLOG(3) << "DoStopDevice. Send stop request for device = " << entry->id |
| 380 << " serial_id = " << entry->serial_id << "."; | 380 << " serial_id = " << entry->serial_id << "."; |
| 381 entry->video_capture_controller()->DoLogOnIOThread( | 381 entry->video_capture_controller()->DoLogOnIOThread( |
| 382 base::StringPrintf("Stopping device: id: %s", entry->id.c_str())); | 382 base::StringPrintf("Stopping device: id: %s\n", entry->id.c_str())); |
| 383 | 383 |
| 384 if (entry->video_capture_device()) { | 384 if (entry->video_capture_device()) { |
| 385 // |entry->video_capture_device| can be null if creating the device fails. | 385 // |entry->video_capture_device| can be null if creating the device fails. |
| 386 device_task_runner_->PostTask( | 386 device_task_runner_->PostTask( |
| 387 FROM_HERE, | 387 FROM_HERE, |
| 388 base::Bind(&VideoCaptureManager::DoStopDeviceOnDeviceThread, this, | 388 base::Bind(&VideoCaptureManager::DoStopDeviceOnDeviceThread, this, |
| 389 base::Passed(entry->ReleaseVideoCaptureDevice()))); | 389 base::Passed(entry->ReleaseVideoCaptureDevice()))); |
| 390 } | 390 } |
| 391 } | 391 } |
| 392 | 392 |
| (...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1127 continue; | 1127 continue; |
| 1128 | 1128 |
| 1129 // Session ID is only valid for Screen capture. So we can fake it to resume | 1129 // Session ID is only valid for Screen capture. So we can fake it to resume |
| 1130 // video capture devices here. | 1130 // video capture devices here. |
| 1131 QueueStartDevice(kFakeSessionId, entry, entry->parameters); | 1131 QueueStartDevice(kFakeSessionId, entry, entry->parameters); |
| 1132 } | 1132 } |
| 1133 } | 1133 } |
| 1134 #endif // defined(OS_ANDROID) | 1134 #endif // defined(OS_ANDROID) |
| 1135 | 1135 |
| 1136 } // namespace content | 1136 } // namespace content |
| OLD | NEW |