Chromium Code Reviews| Index: content/renderer/media/audio_input_message_filter.cc |
| diff --git a/content/renderer/media/audio_input_message_filter.cc b/content/renderer/media/audio_input_message_filter.cc |
| index 412196cb3c1fb9d936c07426c65416cff320fa13..04a36876101818446354285605e59a12346025cb 100644 |
| --- a/content/renderer/media/audio_input_message_filter.cc |
| +++ b/content/renderer/media/audio_input_message_filter.cc |
| @@ -12,6 +12,16 @@ |
| #include "ipc/ipc_logging.h" |
| #include "ipc/ipc_sender.h" |
| +namespace { |
| +void LogMessage(int stream_id, std::string msg) { |
|
tommi (sloooow) - chröme
2014/08/26 11:42:30
const &
henrika (OOO until Aug 14)
2014/08/27 13:44:05
Done.
|
| + std::string log_string = |
|
tommi (sloooow) - chröme
2014/08/26 11:42:30
use ostringstream
henrika (OOO until Aug 14)
2014/08/27 13:44:05
Done.
|
| + base::StringPrintf("[stream_id=%d] AIMF::", stream_id); |
| + log_string += msg; |
| + content::WebRtcLogMessage(log_string); |
| + DVLOG(1) << log_string; |
|
tommi (sloooow) - chröme
2014/08/26 11:42:30
this method should only have an implementation in
henrika (OOO until Aug 14)
2014/08/27 13:44:05
Commented before.
|
| +} |
| +} |
| + |
| namespace content { |
| namespace { |
| @@ -125,10 +135,7 @@ void AudioInputMessageFilter::OnStreamCreated( |
| uint32 length, |
| uint32 total_segments) { |
| DCHECK(io_message_loop_->BelongsToCurrentThread()); |
| - |
| - WebRtcLogMessage(base::StringPrintf( |
| - "AIMF::OnStreamCreated. stream_id=%d", |
| - stream_id)); |
| + LogMessage(stream_id, "OnStreamCreated"); |
| #if !defined(OS_WIN) |
| base::SyncSocket::Handle socket_handle = socket_descriptor.fd; |
| @@ -193,6 +200,9 @@ void AudioInputMessageFilter::AudioInputIPCImpl::CreateStream( |
| DCHECK(delegate); |
| stream_id_ = filter_->delegates_.Add(delegate); |
| + // TODO(henrika): remove all LogMessage calls when we have sorted out the |
| + // existing "no input audio" issues. |
| + LogMessage(stream_id_, "CreateStream"); |
| AudioInputHostMsg_CreateStream_Config config; |
| config.params = params; |
| @@ -204,6 +214,7 @@ void AudioInputMessageFilter::AudioInputIPCImpl::CreateStream( |
| void AudioInputMessageFilter::AudioInputIPCImpl::RecordStream() { |
| DCHECK_NE(stream_id_, kStreamIDNotSet); |
| + LogMessage(stream_id_, "RecordStream"); |
| filter_->Send(new AudioInputHostMsg_RecordStream(stream_id_)); |
| } |
| @@ -215,6 +226,7 @@ void AudioInputMessageFilter::AudioInputIPCImpl::SetVolume(double volume) { |
| void AudioInputMessageFilter::AudioInputIPCImpl::CloseStream() { |
| DCHECK(filter_->io_message_loop_->BelongsToCurrentThread()); |
| DCHECK_NE(stream_id_, kStreamIDNotSet); |
| + LogMessage(stream_id_, "CloseStream"); |
| filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_)); |
| filter_->delegates_.Remove(stream_id_); |
| stream_id_ = kStreamIDNotSet; |