| 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_renderer_host.h" | 5 #include "content/browser/renderer_host/media/audio_input_renderer_host.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/shared_memory.h" | 8 #include "base/memory/shared_memory.h" |
| 9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/numerics/safe_math.h" | 10 #include "base/numerics/safe_math.h" |
| 11 #include "base/process/process.h" | 11 #include "base/process/process.h" |
| 12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 13 #include "content/browser/media/capture/web_contents_audio_input_stream.h" | 13 #include "content/browser/media/capture/web_contents_audio_input_stream.h" |
| 14 #include "content/browser/media/capture/web_contents_capture_util.h" | 14 #include "content/browser/media/capture/web_contents_capture_util.h" |
| 15 #include "content/browser/media/media_internals.h" | 15 #include "content/browser/media/media_internals.h" |
| 16 #include "content/browser/renderer_host/media/audio_input_device_manager.h" | 16 #include "content/browser/renderer_host/media/audio_input_device_manager.h" |
| 17 #include "content/browser/renderer_host/media/audio_input_sync_writer.h" | 17 #include "content/browser/renderer_host/media/audio_input_sync_writer.h" |
| 18 #include "content/browser/renderer_host/media/media_stream_manager.h" | 18 #include "content/browser/renderer_host/media/media_stream_manager.h" |
| 19 #include "media/audio/audio_manager_base.h" | 19 #include "media/audio/audio_manager_base.h" |
| 20 #include "media/base/audio_bus.h" | 20 #include "media/base/audio_bus.h" |
| 21 | 21 |
| 22 namespace { |
| 23 void LogMessage(int stream_id, std::string msg, bool add_prefix) { |
| 24 std::string log_string = |
| 25 add_prefix ? base::StringPrintf("[stream_id=%d] AIRH::", stream_id) |
| 26 : base::StringPrintf("[stream_id=%d] ", stream_id); |
| 27 log_string += msg; |
| 28 content::MediaStreamManager::SendMessageToNativeLog(log_string); |
| 29 DVLOG(1) << log_string; |
| 30 } |
| 31 } |
| 32 |
| 22 namespace content { | 33 namespace content { |
| 23 | 34 |
| 24 struct AudioInputRendererHost::AudioEntry { | 35 struct AudioInputRendererHost::AudioEntry { |
| 25 AudioEntry(); | 36 AudioEntry(); |
| 26 ~AudioEntry(); | 37 ~AudioEntry(); |
| 27 | 38 |
| 28 // The AudioInputController that manages the audio input stream. | 39 // The AudioInputController that manages the audio input stream. |
| 29 scoped_refptr<media::AudioInputController> controller; | 40 scoped_refptr<media::AudioInputController> controller; |
| 30 | 41 |
| 31 // The audio input stream ID in the render view. | 42 // The audio input stream ID in the render view. |
| 32 int stream_id; | 43 int stream_id; |
| 33 | 44 |
| 34 // Shared memory for transmission of the audio data. It has | 45 // Shared memory for transmission of the audio data. It has |
| 35 // |shared_memory_segment_count| equal lengthed segments. | 46 // |shared_memory_segment_count| equal lengthed segments. |
| 36 base::SharedMemory shared_memory; | 47 base::SharedMemory shared_memory; |
| 37 int shared_memory_segment_count; | 48 int shared_memory_segment_count; |
| 38 | 49 |
| 39 // The synchronous writer to be used by the controller. We have the | 50 // The synchronous writer to be used by the controller. We have the |
| 40 // ownership of the writer. | 51 // ownership of the writer. |
| 41 scoped_ptr<media::AudioInputController::SyncWriter> writer; | 52 scoped_ptr<media::AudioInputController::SyncWriter> writer; |
| 42 | 53 |
| 43 // Set to true after we called Close() for the controller. | 54 // Set to true after we called Close() for the controller. |
| 44 bool pending_close; | 55 bool pending_close; |
| 56 |
| 57 // Counts number of NO_DATA_ERROR calls for this stream. |
| 58 int num_no_data_errors; |
| 45 }; | 59 }; |
| 46 | 60 |
| 47 AudioInputRendererHost::AudioEntry::AudioEntry() | 61 AudioInputRendererHost::AudioEntry::AudioEntry() |
| 48 : stream_id(0), | 62 : stream_id(0), |
| 49 shared_memory_segment_count(0), | 63 shared_memory_segment_count(0), |
| 50 pending_close(false) { | 64 pending_close(false), |
| 65 num_no_data_errors(0) { |
| 51 } | 66 } |
| 52 | 67 |
| 53 AudioInputRendererHost::AudioEntry::~AudioEntry() {} | 68 AudioInputRendererHost::AudioEntry::~AudioEntry() {} |
| 54 | 69 |
| 55 AudioInputRendererHost::AudioInputRendererHost( | 70 AudioInputRendererHost::AudioInputRendererHost( |
| 56 media::AudioManager* audio_manager, | 71 media::AudioManager* audio_manager, |
| 57 MediaStreamManager* media_stream_manager, | 72 MediaStreamManager* media_stream_manager, |
| 58 AudioMirroringManager* audio_mirroring_manager, | 73 AudioMirroringManager* audio_mirroring_manager, |
| 59 media::UserInputMonitor* user_input_monitor) | 74 media::UserInputMonitor* user_input_monitor) |
| 60 : BrowserMessageFilter(AudioMsgStart), | 75 : BrowserMessageFilter(AudioMsgStart), |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 #endif | 184 #endif |
| 170 | 185 |
| 171 // If we failed to prepare the sync socket for the renderer then we fail | 186 // If we failed to prepare the sync socket for the renderer then we fail |
| 172 // the construction of audio input stream. | 187 // the construction of audio input stream. |
| 173 if (!writer->PrepareForeignSocketHandle(PeerHandle(), | 188 if (!writer->PrepareForeignSocketHandle(PeerHandle(), |
| 174 &foreign_socket_handle)) { | 189 &foreign_socket_handle)) { |
| 175 DeleteEntryOnError(entry, SYNC_SOCKET_ERROR); | 190 DeleteEntryOnError(entry, SYNC_SOCKET_ERROR); |
| 176 return; | 191 return; |
| 177 } | 192 } |
| 178 | 193 |
| 194 LogMessage(entry->stream_id, |
| 195 "DoCompleteCreation => IPC channel and stream are now open", |
| 196 true); |
| 197 |
| 179 Send(new AudioInputMsg_NotifyStreamCreated(entry->stream_id, | 198 Send(new AudioInputMsg_NotifyStreamCreated(entry->stream_id, |
| 180 foreign_memory_handle, foreign_socket_handle, | 199 foreign_memory_handle, foreign_socket_handle, |
| 181 entry->shared_memory.requested_size(), | 200 entry->shared_memory.requested_size(), |
| 182 entry->shared_memory_segment_count)); | 201 entry->shared_memory_segment_count)); |
| 183 } | 202 } |
| 184 | 203 |
| 185 void AudioInputRendererHost::DoSendRecordingMessage( | 204 void AudioInputRendererHost::DoSendRecordingMessage( |
| 186 media::AudioInputController* controller) { | 205 media::AudioInputController* controller) { |
| 187 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 206 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 188 // TODO(henrika): See crbug.com/115262 for details on why this method | 207 // TODO(henrika): See crbug.com/115262 for details on why this method |
| 189 // should be implemented. | 208 // should be implemented. |
| 209 AudioEntry* entry = LookupByController(controller); |
| 210 if (!entry) |
| 211 return; |
| 212 LogMessage(entry->stream_id, |
| 213 "DoSendRecordingMessage => stream is now started", |
| 214 true); |
| 190 } | 215 } |
| 191 | 216 |
| 192 void AudioInputRendererHost::DoHandleError( | 217 void AudioInputRendererHost::DoHandleError( |
| 193 media::AudioInputController* controller, | 218 media::AudioInputController* controller, |
| 194 media::AudioInputController::ErrorCode error_code) { | 219 media::AudioInputController::ErrorCode error_code) { |
| 195 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 220 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 196 // Log all errors even it is ignored later. | 221 AudioEntry* entry = LookupByController(controller); |
| 197 MediaStreamManager::SendMessageToNativeLog( | 222 if (!entry) |
| 198 base::StringPrintf("AudioInputController error: %d", error_code)); | 223 return; |
| 199 | 224 |
| 200 // This is a fix for crbug.com/357501. The error can be triggered when closing | 225 // This is a fix for crbug.com/357501. The error can be triggered when closing |
| 201 // the lid on Macs, which causes more problems than it fixes. | 226 // the lid on Macs, which causes more problems than it fixes. |
| 202 // Also, in crbug.com/357569, the goal is to remove usage of the error since | 227 // Also, in crbug.com/357569, the goal is to remove usage of the error since |
| 203 // it was added to solve a crash on Windows that no longer can be reproduced. | 228 // it was added to solve a crash on Windows that no longer can be reproduced. |
| 204 if (error_code == media::AudioInputController::NO_DATA_ERROR) { | 229 if (error_code == media::AudioInputController::NO_DATA_ERROR) { |
| 205 DVLOG(1) << "AudioInputRendererHost@" << this << "::DoHandleError: " | 230 // TODO(henrika): it might be possible to do something other than just |
| 206 << "NO_DATA_ERROR ignored."; | 231 // logging when we detect many NO_DATA_ERROR calls for a stream. |
| 232 entry->num_no_data_errors++; |
| 233 if (entry->num_no_data_errors > 5) |
| 234 LogMessage(entry->stream_id, "AIC => stream looks dead", false); |
| 235 else |
| 236 LogMessage(entry->stream_id, "AIC => NO_DATA_ERROR", false); |
| 207 return; | 237 return; |
| 208 } | 238 } |
| 209 | 239 |
| 210 AudioEntry* entry = LookupByController(controller); | 240 const std::string err_msg = |
| 211 if (!entry) | 241 base::StringPrintf("AIC reports error_code=%d", error_code); |
| 212 return; | 242 LogMessage(entry->stream_id, err_msg, false); |
| 213 | 243 |
| 214 audio_log_->OnError(entry->stream_id); | 244 audio_log_->OnError(entry->stream_id); |
| 215 DeleteEntryOnError(entry, AUDIO_INPUT_CONTROLLER_ERROR); | 245 DeleteEntryOnError(entry, AUDIO_INPUT_CONTROLLER_ERROR); |
| 216 } | 246 } |
| 217 | 247 |
| 218 void AudioInputRendererHost::DoLog(media::AudioInputController* controller, | 248 void AudioInputRendererHost::DoLog(media::AudioInputController* controller, |
| 219 const std::string& message) { | 249 const std::string& message) { |
| 220 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 250 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 221 AudioEntry* entry = LookupByController(controller); | 251 AudioEntry* entry = LookupByController(controller); |
| 222 if (!entry) | 252 if (!entry) |
| 223 return; | 253 return; |
| 224 | 254 |
| 225 // Add stream ID and current audio level reported by AIC to native log. | 255 // Add stream ID and current audio level reported by AIC to native log. |
| 226 std::string log_string = | 256 LogMessage(entry->stream_id, message, false); |
| 227 base::StringPrintf("[stream_id=%d] ", entry->stream_id); | |
| 228 log_string += message; | |
| 229 MediaStreamManager::SendMessageToNativeLog(log_string); | |
| 230 DVLOG(1) << log_string; | |
| 231 } | 257 } |
| 232 | 258 |
| 233 bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message) { | 259 bool AudioInputRendererHost::OnMessageReceived(const IPC::Message& message) { |
| 234 bool handled = true; | 260 bool handled = true; |
| 235 IPC_BEGIN_MESSAGE_MAP(AudioInputRendererHost, message) | 261 IPC_BEGIN_MESSAGE_MAP(AudioInputRendererHost, message) |
| 236 IPC_MESSAGE_HANDLER(AudioInputHostMsg_CreateStream, OnCreateStream) | 262 IPC_MESSAGE_HANDLER(AudioInputHostMsg_CreateStream, OnCreateStream) |
| 237 IPC_MESSAGE_HANDLER(AudioInputHostMsg_RecordStream, OnRecordStream) | 263 IPC_MESSAGE_HANDLER(AudioInputHostMsg_RecordStream, OnRecordStream) |
| 238 IPC_MESSAGE_HANDLER(AudioInputHostMsg_CloseStream, OnCloseStream) | 264 IPC_MESSAGE_HANDLER(AudioInputHostMsg_CloseStream, OnCloseStream) |
| 239 IPC_MESSAGE_HANDLER(AudioInputHostMsg_SetVolume, OnSetVolume) | 265 IPC_MESSAGE_HANDLER(AudioInputHostMsg_SetVolume, OnSetVolume) |
| 240 IPC_MESSAGE_UNHANDLED(handled = false) | 266 IPC_MESSAGE_UNHANDLED(handled = false) |
| 241 IPC_END_MESSAGE_MAP() | 267 IPC_END_MESSAGE_MAP() |
| 242 | 268 |
| 243 return handled; | 269 return handled; |
| 244 } | 270 } |
| 245 | 271 |
| 246 void AudioInputRendererHost::OnCreateStream( | 272 void AudioInputRendererHost::OnCreateStream( |
| 247 int stream_id, | 273 int stream_id, |
| 248 int render_view_id, | 274 int render_view_id, |
| 249 int session_id, | 275 int session_id, |
| 250 const AudioInputHostMsg_CreateStream_Config& config) { | 276 const AudioInputHostMsg_CreateStream_Config& config) { |
| 251 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 277 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 252 | 278 |
| 253 DVLOG(1) << "AudioInputRendererHost@" << this | 279 std::ostringstream oss; |
| 254 << "::OnCreateStream(stream_id=" << stream_id | 280 oss << "[stream_id=" << stream_id << "] " |
| 255 << ", render_view_id=" << render_view_id | 281 << "AIRH::OnCreateStream(render_view_id=" << render_view_id |
| 256 << ", session_id=" << session_id << ")"; | 282 << ", session_id=" << session_id << ")"; |
| 257 DCHECK_GT(render_view_id, 0); | 283 DCHECK_GT(render_view_id, 0); |
| 258 | 284 |
| 259 // media::AudioParameters is validated in the deserializer. | 285 // media::AudioParameters is validated in the deserializer. |
| 260 if (LookupById(stream_id) != NULL) { | 286 if (LookupById(stream_id) != NULL) { |
| 261 SendErrorMessage(stream_id, STREAM_ALREADY_EXISTS); | 287 SendErrorMessage(stream_id, STREAM_ALREADY_EXISTS); |
| 262 return; | 288 return; |
| 263 } | 289 } |
| 264 | 290 |
| 265 media::AudioParameters audio_params(config.params); | 291 media::AudioParameters audio_params(config.params); |
| 266 if (media_stream_manager_->audio_input_device_manager()-> | 292 if (media_stream_manager_->audio_input_device_manager()-> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 280 audio_input_device_manager()->GetOpenedDeviceInfoById(session_id); | 306 audio_input_device_manager()->GetOpenedDeviceInfoById(session_id); |
| 281 if (!info) { | 307 if (!info) { |
| 282 SendErrorMessage(stream_id, PERMISSION_DENIED); | 308 SendErrorMessage(stream_id, PERMISSION_DENIED); |
| 283 DLOG(WARNING) << "No permission has been granted to input stream with " | 309 DLOG(WARNING) << "No permission has been granted to input stream with " |
| 284 << "session_id=" << session_id; | 310 << "session_id=" << session_id; |
| 285 return; | 311 return; |
| 286 } | 312 } |
| 287 | 313 |
| 288 device_id = info->device.id; | 314 device_id = info->device.id; |
| 289 device_name = info->device.name; | 315 device_name = info->device.name; |
| 316 oss << ": device_name=" << device_name; |
| 290 } | 317 } |
| 318 MediaStreamManager::SendMessageToNativeLog(oss.str()); |
| 319 DVLOG(1) << oss.str(); |
| 291 | 320 |
| 292 // Create a new AudioEntry structure. | 321 // Create a new AudioEntry structure. |
| 293 scoped_ptr<AudioEntry> entry(new AudioEntry()); | 322 scoped_ptr<AudioEntry> entry(new AudioEntry()); |
| 294 | 323 |
| 295 const uint32 segment_size = | 324 const uint32 segment_size = |
| 296 (sizeof(media::AudioInputBufferParameters) + | 325 (sizeof(media::AudioInputBufferParameters) + |
| 297 media::AudioBus::CalculateMemorySize(audio_params)); | 326 media::AudioBus::CalculateMemorySize(audio_params)); |
| 298 entry->shared_memory_segment_count = config.shared_memory_count; | 327 entry->shared_memory_segment_count = config.shared_memory_count; |
| 299 | 328 |
| 300 // Create the shared memory and share it with the renderer process | 329 // Create the shared memory and share it with the renderer process |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 | 379 |
| 351 // Set the initial AGC state for the audio input stream. Note that, the AGC | 380 // Set the initial AGC state for the audio input stream. Note that, the AGC |
| 352 // is only supported in AUDIO_PCM_LOW_LATENCY mode. | 381 // is only supported in AUDIO_PCM_LOW_LATENCY mode. |
| 353 if (config.params.format() == media::AudioParameters::AUDIO_PCM_LOW_LATENCY) | 382 if (config.params.format() == media::AudioParameters::AUDIO_PCM_LOW_LATENCY) |
| 354 entry->controller->SetAutomaticGainControl(config.automatic_gain_control); | 383 entry->controller->SetAutomaticGainControl(config.automatic_gain_control); |
| 355 | 384 |
| 356 // Since the controller was created successfully, create an entry and add it | 385 // Since the controller was created successfully, create an entry and add it |
| 357 // to the map. | 386 // to the map. |
| 358 entry->stream_id = stream_id; | 387 entry->stream_id = stream_id; |
| 359 audio_entries_.insert(std::make_pair(stream_id, entry.release())); | 388 audio_entries_.insert(std::make_pair(stream_id, entry.release())); |
| 360 | |
| 361 MediaStreamManager::SendMessageToNativeLog( | |
| 362 "Audio input stream created successfully. Device name: " + device_name); | |
| 363 audio_log_->OnCreated(stream_id, audio_params, device_id); | 389 audio_log_->OnCreated(stream_id, audio_params, device_id); |
| 364 } | 390 } |
| 365 | 391 |
| 366 void AudioInputRendererHost::OnRecordStream(int stream_id) { | 392 void AudioInputRendererHost::OnRecordStream(int stream_id) { |
| 367 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 393 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 394 LogMessage(stream_id, "OnRecordStream", true); |
| 368 | 395 |
| 369 AudioEntry* entry = LookupById(stream_id); | 396 AudioEntry* entry = LookupById(stream_id); |
| 370 if (!entry) { | 397 if (!entry) { |
| 371 SendErrorMessage(stream_id, INVALID_AUDIO_ENTRY); | 398 SendErrorMessage(stream_id, INVALID_AUDIO_ENTRY); |
| 372 return; | 399 return; |
| 373 } | 400 } |
| 374 | 401 |
| 375 entry->controller->Record(); | 402 entry->controller->Record(); |
| 376 audio_log_->OnStarted(stream_id); | 403 audio_log_->OnStarted(stream_id); |
| 377 } | 404 } |
| 378 | 405 |
| 379 void AudioInputRendererHost::OnCloseStream(int stream_id) { | 406 void AudioInputRendererHost::OnCloseStream(int stream_id) { |
| 380 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 407 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 408 LogMessage(stream_id, "OnCloseStream", true); |
| 381 | 409 |
| 382 AudioEntry* entry = LookupById(stream_id); | 410 AudioEntry* entry = LookupById(stream_id); |
| 383 | 411 |
| 384 if (entry) | 412 if (entry) |
| 385 CloseAndDeleteStream(entry); | 413 CloseAndDeleteStream(entry); |
| 386 } | 414 } |
| 387 | 415 |
| 388 void AudioInputRendererHost::OnSetVolume(int stream_id, double volume) { | 416 void AudioInputRendererHost::OnSetVolume(int stream_id, double volume) { |
| 389 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 417 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 390 | 418 |
| 391 AudioEntry* entry = LookupById(stream_id); | 419 AudioEntry* entry = LookupById(stream_id); |
| 392 if (!entry) { | 420 if (!entry) { |
| 393 SendErrorMessage(stream_id, INVALID_AUDIO_ENTRY); | 421 SendErrorMessage(stream_id, INVALID_AUDIO_ENTRY); |
| 394 return; | 422 return; |
| 395 } | 423 } |
| 396 | 424 |
| 397 entry->controller->SetVolume(volume); | 425 entry->controller->SetVolume(volume); |
| 398 audio_log_->OnSetVolume(stream_id, volume); | 426 audio_log_->OnSetVolume(stream_id, volume); |
| 399 } | 427 } |
| 400 | 428 |
| 401 void AudioInputRendererHost::SendErrorMessage( | 429 void AudioInputRendererHost::SendErrorMessage( |
| 402 int stream_id, ErrorCode error_code) { | 430 int stream_id, ErrorCode error_code) { |
| 403 MediaStreamManager::SendMessageToNativeLog( | 431 std::string err_msg = |
| 404 base::StringPrintf("AudioInputRendererHost error: %d", error_code)); | 432 base::StringPrintf("SendErrorMessage(error_code=%d)", error_code); |
| 433 LogMessage(stream_id, err_msg, true); |
| 434 |
| 405 Send(new AudioInputMsg_NotifyStreamStateChanged( | 435 Send(new AudioInputMsg_NotifyStreamStateChanged( |
| 406 stream_id, media::AudioInputIPCDelegate::kError)); | 436 stream_id, media::AudioInputIPCDelegate::kError)); |
| 407 } | 437 } |
| 408 | 438 |
| 409 void AudioInputRendererHost::DeleteEntries() { | 439 void AudioInputRendererHost::DeleteEntries() { |
| 410 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 440 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 411 | 441 |
| 412 for (AudioEntryMap::iterator i = audio_entries_.begin(); | 442 for (AudioEntryMap::iterator i = audio_entries_.begin(); |
| 413 i != audio_entries_.end(); ++i) { | 443 i != audio_entries_.end(); ++i) { |
| 414 CloseAndDeleteStream(i->second); | 444 CloseAndDeleteStream(i->second); |
| 415 } | 445 } |
| 416 } | 446 } |
| 417 | 447 |
| 418 void AudioInputRendererHost::CloseAndDeleteStream(AudioEntry* entry) { | 448 void AudioInputRendererHost::CloseAndDeleteStream(AudioEntry* entry) { |
| 419 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 449 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 420 | 450 |
| 421 if (!entry->pending_close) { | 451 if (!entry->pending_close) { |
| 452 LogMessage(entry->stream_id, "CloseAndDeleteStream", true); |
| 422 entry->controller->Close(base::Bind(&AudioInputRendererHost::DeleteEntry, | 453 entry->controller->Close(base::Bind(&AudioInputRendererHost::DeleteEntry, |
| 423 this, entry)); | 454 this, entry)); |
| 424 entry->pending_close = true; | 455 entry->pending_close = true; |
| 425 audio_log_->OnClosed(entry->stream_id); | 456 audio_log_->OnClosed(entry->stream_id); |
| 426 } | 457 } |
| 427 } | 458 } |
| 428 | 459 |
| 429 void AudioInputRendererHost::DeleteEntry(AudioEntry* entry) { | 460 void AudioInputRendererHost::DeleteEntry(AudioEntry* entry) { |
| 430 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 461 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
| 462 LogMessage(entry->stream_id, "DeleteEntry => stream is now closed", true); |
| 431 | 463 |
| 432 // Delete the entry when this method goes out of scope. | 464 // Delete the entry when this method goes out of scope. |
| 433 scoped_ptr<AudioEntry> entry_deleter(entry); | 465 scoped_ptr<AudioEntry> entry_deleter(entry); |
| 434 | 466 |
| 435 // Erase the entry from the map. | 467 // Erase the entry from the map. |
| 436 audio_entries_.erase(entry->stream_id); | 468 audio_entries_.erase(entry->stream_id); |
| 437 } | 469 } |
| 438 | 470 |
| 439 void AudioInputRendererHost::DeleteEntryOnError(AudioEntry* entry, | 471 void AudioInputRendererHost::DeleteEntryOnError(AudioEntry* entry, |
| 440 ErrorCode error_code) { | 472 ErrorCode error_code) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 464 // TODO(hclam): Implement a faster look up method. | 496 // TODO(hclam): Implement a faster look up method. |
| 465 for (AudioEntryMap::iterator i = audio_entries_.begin(); | 497 for (AudioEntryMap::iterator i = audio_entries_.begin(); |
| 466 i != audio_entries_.end(); ++i) { | 498 i != audio_entries_.end(); ++i) { |
| 467 if (controller == i->second->controller.get()) | 499 if (controller == i->second->controller.get()) |
| 468 return i->second; | 500 return i->second; |
| 469 } | 501 } |
| 470 return NULL; | 502 return NULL; |
| 471 } | 503 } |
| 472 | 504 |
| 473 } // namespace content | 505 } // namespace content |
| OLD | NEW |