Index: media/audio/android/audio_manager_android.cc |
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc |
index a7ec08d69c4d30e60b56716a450f43ae8c1e6b86..e48aa5bb785fe229f08ffcf97f42f867eba83558 100644 |
--- a/media/audio/android/audio_manager_android.cc |
+++ b/media/audio/android/audio_manager_android.cc |
@@ -163,23 +163,20 @@ |
AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream( |
const AudioParameters& params, |
- const std::string& device_id, |
- const LogCallback& log_callback) { |
- DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
- AudioOutputStream* stream = AudioManagerBase::MakeAudioOutputStream( |
- params, std::string(), AudioManager::LogCallback()); |
+ const std::string& device_id) { |
+ DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
+ AudioOutputStream* stream = |
+ AudioManagerBase::MakeAudioOutputStream(params, std::string()); |
streams_.insert(static_cast<OpenSLESOutputStream*>(stream)); |
return stream; |
} |
AudioInputStream* AudioManagerAndroid::MakeAudioInputStream( |
- const AudioParameters& params, |
- const std::string& device_id, |
- const LogCallback& log_callback) { |
+ const AudioParameters& params, const std::string& device_id) { |
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
bool has_no_input_streams = HasNoAudioInputStreams(); |
- AudioInputStream* stream = AudioManagerBase::MakeAudioInputStream( |
- params, device_id, AudioManager::LogCallback()); |
+ AudioInputStream* stream = |
+ AudioManagerBase::MakeAudioInputStream(params, device_id); |
// The audio manager for Android creates streams intended for real-time |
// VoIP sessions and therefore sets the audio mode to MODE_IN_COMMUNICATION. |
@@ -212,8 +209,7 @@ |
} |
AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( |
- const AudioParameters& params, |
- const LogCallback& log_callback) { |
+ const AudioParameters& params) { |
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); |
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
return new OpenSLESOutputStream(this, params, SL_ANDROID_STREAM_MEDIA); |
@@ -221,8 +217,7 @@ |
AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( |
const AudioParameters& params, |
- const std::string& device_id, |
- const LogCallback& log_callback) { |
+ const std::string& device_id) { |
DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; |
DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); |
@@ -234,9 +229,7 @@ |
} |
AudioInputStream* AudioManagerAndroid::MakeLinearInputStream( |
- const AudioParameters& params, |
- const std::string& device_id, |
- const LogCallback& log_callback) { |
+ const AudioParameters& params, const std::string& device_id) { |
// TODO(henrika): add support for device selection if/when any client |
// needs it. |
DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; |
@@ -245,9 +238,7 @@ |
} |
AudioInputStream* AudioManagerAndroid::MakeLowLatencyInputStream( |
- const AudioParameters& params, |
- const std::string& device_id, |
- const LogCallback& log_callback) { |
+ const AudioParameters& params, const std::string& device_id) { |
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); |
DLOG_IF(ERROR, device_id.empty()) << "Invalid device ID!"; |