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/audio_input_device_manager.h" | 5 #include "content/browser/renderer_host/media/audio_input_device_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "content/browser/renderer_host/media/audio_input_device_manager_event_h
andler.h" | 9 #include "content/browser/renderer_host/media/audio_input_device_manager_event_h
andler.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 AudioInputDeviceManager::AudioInputDeviceManager( | 24 AudioInputDeviceManager::AudioInputDeviceManager( |
25 media::AudioManager* audio_manager) | 25 media::AudioManager* audio_manager) |
26 : listener_(NULL), | 26 : listener_(NULL), |
27 next_capture_session_id_(kFirstSessionId), | 27 next_capture_session_id_(kFirstSessionId), |
28 audio_manager_(audio_manager) { | 28 audio_manager_(audio_manager) { |
29 } | 29 } |
30 | 30 |
31 AudioInputDeviceManager::~AudioInputDeviceManager() { | 31 AudioInputDeviceManager::~AudioInputDeviceManager() { |
32 } | 32 } |
33 | 33 |
34 void AudioInputDeviceManager::Register(MediaStreamProviderListener* listener) { | 34 void AudioInputDeviceManager::Register( |
| 35 MediaStreamProviderListener* listener, |
| 36 base::MessageLoopProxy* device_thread_loop) { |
35 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
36 DCHECK(!listener_); | 38 DCHECK(!listener_); |
| 39 DCHECK(!device_loop_); |
37 listener_ = listener; | 40 listener_ = listener; |
| 41 device_loop_ = device_thread_loop; |
38 } | 42 } |
39 | 43 |
40 void AudioInputDeviceManager::Unregister() { | 44 void AudioInputDeviceManager::Unregister() { |
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
42 DCHECK(listener_); | 46 DCHECK(listener_); |
43 listener_ = NULL; | 47 listener_ = NULL; |
44 } | 48 } |
45 | 49 |
46 void AudioInputDeviceManager::EnumerateDevices() { | 50 void AudioInputDeviceManager::EnumerateDevices() { |
47 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
48 DCHECK(listener_); | 52 DCHECK(listener_); |
49 | 53 |
| 54 device_loop_->PostTask( |
| 55 FROM_HERE, |
| 56 base::Bind(&AudioInputDeviceManager::EnumerateOnDeviceThread, this)); |
| 57 } |
| 58 |
| 59 int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) { |
| 60 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 61 // Generates a new id for this device. |
| 62 int session_id = next_capture_session_id_++; |
| 63 device_loop_->PostTask( |
| 64 FROM_HERE, |
| 65 base::Bind(&AudioInputDeviceManager::OpenOnDeviceThread, |
| 66 this, session_id, device)); |
| 67 |
| 68 return session_id; |
| 69 } |
| 70 |
| 71 void AudioInputDeviceManager::Close(int session_id) { |
| 72 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 73 DCHECK(listener_); |
| 74 device_loop_->PostTask( |
| 75 FROM_HERE, |
| 76 base::Bind(&AudioInputDeviceManager::CloseOnDeviceThread, |
| 77 this, session_id)); |
| 78 } |
| 79 |
| 80 void AudioInputDeviceManager::EnumerateOnDeviceThread() { |
| 81 DCHECK(IsOnDeviceThread()); |
| 82 // AudioManager is guaranteed to outlive MediaStreamManager in |
| 83 // BrowserMainloop. |
50 media::AudioDeviceNames device_names; | 84 media::AudioDeviceNames device_names; |
51 audio_manager_->GetAudioInputDeviceNames(&device_names); | 85 audio_manager_->GetAudioInputDeviceNames(&device_names); |
52 | 86 |
53 StreamDeviceInfoArray* devices = new StreamDeviceInfoArray; | 87 StreamDeviceInfoArray* devices = new StreamDeviceInfoArray; |
54 for (media::AudioDeviceNames::iterator it = device_names.begin(); | 88 for (media::AudioDeviceNames::iterator it = device_names.begin(); |
55 it != device_names.end(); | 89 it != device_names.end(); |
56 ++it) { | 90 ++it) { |
57 devices->push_back(StreamDeviceInfo( | 91 devices->push_back(StreamDeviceInfo( |
58 content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, it->device_name, | 92 content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, it->device_name, |
59 it->unique_id, false)); | 93 it->unique_id, false)); |
60 } | 94 } |
61 | 95 |
62 // Returns the device list through the listener by posting a task on | 96 // Returns the device list through the listener by posting a task on |
63 // IO thread since MediaStreamManager handles the callback asynchronously. | 97 // IO thread since MediaStreamManager handles the callback asynchronously. |
64 BrowserThread::PostTask( | 98 BrowserThread::PostTask( |
65 BrowserThread::IO, | 99 BrowserThread::IO, |
66 FROM_HERE, | 100 FROM_HERE, |
67 base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread, | 101 base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread, |
68 this, | 102 this, |
69 devices)); | 103 devices)); |
70 } | 104 } |
71 | 105 |
72 int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) { | 106 void AudioInputDeviceManager::OpenOnDeviceThread( |
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 107 int session_id, const StreamDeviceInfo& device) { |
74 | 108 DCHECK(IsOnDeviceThread()); |
75 // Generates a new id for this device. | |
76 int session_id = next_capture_session_id_++; | |
77 DCHECK(devices_.find(session_id) == devices_.end()); | 109 DCHECK(devices_.find(session_id) == devices_.end()); |
78 | 110 |
79 media::AudioDeviceName audio_input_device_name; | |
80 audio_input_device_name.device_name = device.name; | |
81 audio_input_device_name.unique_id = device.device_id; | |
82 | |
83 // Adds the session_id and device to the list. | 111 // Adds the session_id and device to the list. |
84 devices_[session_id] = audio_input_device_name; | 112 media::AudioDeviceName target_device(device.name, device.device_id); |
| 113 devices_[session_id] = target_device; |
85 | 114 |
86 // Returns the |session_id| through the listener by posting a task on | 115 // Returns the |session_id| through the listener by posting a task on |
87 // IO thread since MediaStreamManager handles the callback asynchronously. | 116 // IO thread since MediaStreamManager handles the callback asynchronously. |
88 BrowserThread::PostTask(BrowserThread::IO, | 117 BrowserThread::PostTask(BrowserThread::IO, |
89 FROM_HERE, | 118 FROM_HERE, |
90 base::Bind(&AudioInputDeviceManager::OpenedOnIOThread, | 119 base::Bind(&AudioInputDeviceManager::OpenedOnIOThread, |
91 this, | 120 this, |
92 session_id)); | 121 session_id)); |
93 | |
94 return session_id; | |
95 } | 122 } |
96 | 123 |
97 void AudioInputDeviceManager::Close(int session_id) { | 124 void AudioInputDeviceManager::CloseOnDeviceThread(int session_id) { |
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 125 DCHECK(IsOnDeviceThread()); |
99 DCHECK(listener_); | |
100 | 126 |
101 if (devices_.find(session_id) != devices_.end()) | 127 if (devices_.find(session_id) != devices_.end()) |
102 devices_.erase(session_id); | 128 devices_.erase(session_id); |
103 | 129 |
104 // Checks if the device has been stopped, if not, send stop signal. | 130 // Checks if the device has been stopped, if not, send stop signal. |
105 EventHandlerMap::iterator it = event_handlers_.find(session_id); | 131 EventHandlerMap::iterator it = event_handlers_.find(session_id); |
106 if (it != event_handlers_.end()) { | 132 if (it != event_handlers_.end()) { |
107 it->second->OnDeviceStopped(session_id); | 133 it->second->OnDeviceStopped(session_id); |
108 event_handlers_.erase(session_id); | 134 event_handlers_.erase(session_id); |
109 } | 135 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 session_id); | 200 session_id); |
175 } | 201 } |
176 | 202 |
177 void AudioInputDeviceManager::ClosedOnIOThread(int session_id) { | 203 void AudioInputDeviceManager::ClosedOnIOThread(int session_id) { |
178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 204 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
179 if (listener_) | 205 if (listener_) |
180 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, | 206 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, |
181 session_id); | 207 session_id); |
182 } | 208 } |
183 | 209 |
| 210 bool AudioInputDeviceManager::IsOnDeviceThread() const { |
| 211 return device_loop_->BelongsToCurrentThread(); |
| 212 } |
| 213 |
184 } // namespace media_stream | 214 } // namespace media_stream |
OLD | NEW |