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

Unified Diff: webrtc/modules/audio_device/android/opensles_player.h

Issue 1415603008: Revert of Fix for "Android audio playout doesn't support non-call media stream" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
Index: webrtc/modules/audio_device/android/opensles_player.h
diff --git a/webrtc/modules/audio_device/android/opensles_player.h b/webrtc/modules/audio_device/android/opensles_player.h
index 96b1d49ac546448474a1fd76b0027fd1e787c63e..d96388b6b535748c364d5e7346ea9fee382a8984 100644
--- a/webrtc/modules/audio_device/android/opensles_player.h
+++ b/webrtc/modules/audio_device/android/opensles_player.h
@@ -130,20 +130,6 @@
// AudioManager.
const AudioParameters audio_parameters_;
- // Contains the stream type provided to this class at construction by the
- // AudioManager. Possible input values are:
- // - AudioManager.STREAM_VOICE_CALL = 0
- // - AudioManager.STREAM_RING = 2
- // - AudioManager.STREAM_MUSIC = 3
- // These value are mapped to the corresponding audio playback stream type
- // values in the "OpenSL ES domain":
- // - SL_ANDROID_STREAM_VOICE <=> STREAM_VOICE_CALL (0)
- // - SL_ANDROID_STREAM_RING <=> STREAM_RING (2)
- // - SL_ANDROID_STREAM_MEDIA <=> STREAM_MUSIC (3)
- // when creating the audio player. See SLES/OpenSLES_AndroidConfiguration.h
- // for details.
- const int stream_type_;
-
// Raw pointer handle provided to us in AttachAudioBuffer(). Owned by the
// AudioDeviceModuleImpl class and called by AudioDeviceModuleImpl::Create().
AudioDeviceBuffer* audio_device_buffer_;

Powered by Google App Engine
This is Rietveld 408576698