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..c66d6fb9a66ff6e4cd2ee581f76bcf59518f7241 100644 |
--- a/content/renderer/media/audio_input_message_filter.cc |
+++ b/content/renderer/media/audio_input_message_filter.cc |
@@ -12,6 +12,15 @@ |
#include "ipc/ipc_logging.h" |
#include "ipc/ipc_sender.h" |
+namespace { |
no longer working on chromium
2014/08/29 12:33:20
combine this anonymous namespace with the existing
henrika (OOO until Aug 14)
2014/08/29 12:51:29
Done.
|
+void LogMessage(int stream_id, const std::string& msg) { |
+ std::ostringstream oss; |
+ oss << "[stream_id=" << stream_id << "] AIMF::" << msg; |
+ content::WebRtcLogMessage(oss.str()); |
+ DVLOG(1) << oss.str(); |
+} |
+} |
+ |
namespace content { |
namespace { |
@@ -125,10 +134,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 +199,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 +213,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 +225,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; |