| 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,
|
|
|