Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Unified Diff: media/audio/android/audio_manager_android.cc

Issue 2917203002: Add MuteableAudioOutputStream interface to export SetMute(). (Closed)
Patch Set: Bug fixed Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/android/audio_manager_android.h ('k') | media/audio/android/muteable_audio_output_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5f6e2669bcc1d95dab0868f629b8c01108748e65..17567885331622d651a43c1573ee17bb07f691f8 100644
--- a/media/audio/android/audio_manager_android.cc
+++ b/media/audio/android/audio_manager_android.cc
@@ -171,7 +171,7 @@ AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
AudioOutputStream* stream = AudioManagerBase::MakeAudioOutputStream(
params, std::string(), AudioManager::LogCallback());
if (stream)
- streams_.insert(static_cast<OpenSLESOutputStream*>(stream));
+ streams_.insert(static_cast<MuteableAudioOutputStream*>(stream));
return stream;
}
@@ -197,7 +197,7 @@ AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) {
DCHECK(GetTaskRunner()->BelongsToCurrentThread());
- streams_.erase(static_cast<OpenSLESOutputStream*>(stream));
+ streams_.erase(static_cast<MuteableAudioOutputStream*>(stream));
AudioManagerBase::ReleaseOutputStream(stream);
}
@@ -235,6 +235,15 @@ AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
return new OpenSLESOutputStream(this, params, stream_type);
}
+AudioOutputStream* AudioManagerAndroid::MakeBitstreamOutputStream(
+ const AudioParameters& params,
+ const std::string& device_id,
+ const LogCallback& log_callback) {
+ // TODO(tsunghung): add output stream for audio bitstream formats.
+ NOTREACHED();
+ return nullptr;
+}
+
AudioInputStream* AudioManagerAndroid::MakeLinearInputStream(
const AudioParameters& params,
const std::string& device_id,
« no previous file with comments | « media/audio/android/audio_manager_android.h ('k') | media/audio/android/muteable_audio_output_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698