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(MediaStreamProviderListener* listener, |
35 base::MessageLoopProxy* message_loop) { | |
35 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 36 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
36 DCHECK(!listener_); | 37 DCHECK(!listener_); |
38 DCHECK(!device_loop_); | |
37 listener_ = listener; | 39 listener_ = listener; |
40 device_loop_ = message_loop; | |
38 } | 41 } |
39 | 42 |
40 void AudioInputDeviceManager::Unregister() { | 43 void AudioInputDeviceManager::Unregister() { |
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 44 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
42 DCHECK(listener_); | 45 DCHECK(listener_); |
43 listener_ = NULL; | 46 listener_ = NULL; |
44 } | 47 } |
45 | 48 |
46 void AudioInputDeviceManager::EnumerateDevices() { | 49 void AudioInputDeviceManager::EnumerateDevices() { |
47 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
48 DCHECK(listener_); | 51 DCHECK(listener_); |
49 | 52 |
53 device_loop_->PostTask( | |
54 FROM_HERE, | |
55 base::Bind(&AudioInputDeviceManager::EnumerateOnDeviceThread, this)); | |
56 } | |
57 | |
58 int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) { | |
59 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
60 // Generates a new id for this device. | |
61 int session_id = next_capture_session_id_++; | |
62 device_loop_->PostTask( | |
63 FROM_HERE, | |
64 base::Bind(&AudioInputDeviceManager::OpenOnDeviceThread, | |
65 this, session_id, device)); | |
66 | |
67 return session_id; | |
68 } | |
69 | |
70 void AudioInputDeviceManager::Close(int session_id) { | |
71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
72 DCHECK(listener_); | |
73 device_loop_->PostTask( | |
74 FROM_HERE, | |
75 base::Bind(&AudioInputDeviceManager::CloseOnDeviceThread, | |
76 this, session_id)); | |
77 } | |
78 | |
79 void AudioInputDeviceManager::EnumerateOnDeviceThread() { | |
80 DCHECK(IsOnDeviceThread()); | |
81 // AudioManager is deleted after FILE thread stops, so the device thread | |
tommi (sloooow) - chröme
2012/07/04 13:46:48
do we still use the FILE thread for something or d
no longer working on chromium
2012/07/04 14:31:39
Wrong comment from some previous upload.
| |
82 // should never outlive the AudioManager. | |
50 media::AudioDeviceNames device_names; | 83 media::AudioDeviceNames device_names; |
51 audio_manager_->GetAudioInputDeviceNames(&device_names); | 84 audio_manager_->GetAudioInputDeviceNames(&device_names); |
52 | 85 |
53 StreamDeviceInfoArray* devices = new StreamDeviceInfoArray; | 86 StreamDeviceInfoArray* devices = new StreamDeviceInfoArray; |
54 for (media::AudioDeviceNames::iterator it = device_names.begin(); | 87 for (media::AudioDeviceNames::iterator it = device_names.begin(); |
55 it != device_names.end(); | 88 it != device_names.end(); |
56 ++it) { | 89 ++it) { |
57 devices->push_back(StreamDeviceInfo( | 90 devices->push_back(StreamDeviceInfo( |
58 content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, it->device_name, | 91 content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, it->device_name, |
59 it->unique_id, false)); | 92 it->unique_id, false)); |
60 } | 93 } |
61 | 94 |
62 // Returns the device list through the listener by posting a task on | 95 // Returns the device list through the listener by posting a task on |
63 // IO thread since MediaStreamManager handles the callback asynchronously. | 96 // IO thread since MediaStreamManager handles the callback asynchronously. |
64 BrowserThread::PostTask( | 97 BrowserThread::PostTask( |
65 BrowserThread::IO, | 98 BrowserThread::IO, |
66 FROM_HERE, | 99 FROM_HERE, |
67 base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread, | 100 base::Bind(&AudioInputDeviceManager::DevicesEnumeratedOnIOThread, |
68 this, | 101 this, |
69 devices)); | 102 devices)); |
70 } | 103 } |
71 | 104 |
72 int AudioInputDeviceManager::Open(const StreamDeviceInfo& device) { | 105 void AudioInputDeviceManager::OpenOnDeviceThread( |
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 106 int session_id, const StreamDeviceInfo& device) { |
74 | 107 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()); | 108 DCHECK(devices_.find(session_id) == devices_.end()); |
78 | 109 |
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. | 110 // Adds the session_id and device to the list. |
84 devices_[session_id] = audio_input_device_name; | 111 media::AudioDeviceName target_device(device.name, device.device_id); |
112 devices_[session_id] = target_device; | |
85 | 113 |
86 // Returns the |session_id| through the listener by posting a task on | 114 // Returns the |session_id| through the listener by posting a task on |
87 // IO thread since MediaStreamManager handles the callback asynchronously. | 115 // IO thread since MediaStreamManager handles the callback asynchronously. |
88 BrowserThread::PostTask(BrowserThread::IO, | 116 BrowserThread::PostTask(BrowserThread::IO, |
89 FROM_HERE, | 117 FROM_HERE, |
90 base::Bind(&AudioInputDeviceManager::OpenedOnIOThread, | 118 base::Bind(&AudioInputDeviceManager::OpenedOnIOThread, |
91 this, | 119 this, |
92 session_id)); | 120 session_id)); |
93 | |
94 return session_id; | |
95 } | 121 } |
96 | 122 |
97 void AudioInputDeviceManager::Close(int session_id) { | 123 void AudioInputDeviceManager::CloseOnDeviceThread(int session_id) { |
98 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 124 DCHECK(IsOnDeviceThread()); |
99 DCHECK(listener_); | |
100 | 125 |
101 if (devices_.find(session_id) != devices_.end()) | 126 if (devices_.find(session_id) != devices_.end()) |
102 devices_.erase(session_id); | 127 devices_.erase(session_id); |
103 | 128 |
104 // Checks if the device has been stopped, if not, send stop signal. | 129 // Checks if the device has been stopped, if not, send stop signal. |
105 EventHandlerMap::iterator it = event_handlers_.find(session_id); | 130 EventHandlerMap::iterator it = event_handlers_.find(session_id); |
106 if (it != event_handlers_.end()) { | 131 if (it != event_handlers_.end()) { |
107 it->second->OnDeviceStopped(session_id); | 132 it->second->OnDeviceStopped(session_id); |
108 event_handlers_.erase(session_id); | 133 event_handlers_.erase(session_id); |
109 } | 134 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
174 session_id); | 199 session_id); |
175 } | 200 } |
176 | 201 |
177 void AudioInputDeviceManager::ClosedOnIOThread(int session_id) { | 202 void AudioInputDeviceManager::ClosedOnIOThread(int session_id) { |
178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 203 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
179 if (listener_) | 204 if (listener_) |
180 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, | 205 listener_->Closed(content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, |
181 session_id); | 206 session_id); |
182 } | 207 } |
183 | 208 |
209 bool AudioInputDeviceManager::IsOnDeviceThread() const { | |
210 return device_loop_->BelongsToCurrentThread(); | |
211 } | |
212 | |
184 } // namespace media_stream | 213 } // namespace media_stream |
OLD | NEW |