Fix for "Android audio playout doesn't support non-call media stream"

webrtc/modules/audio_device/android/audio_manager.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 75 matching lines @@
   // Returns true if the device supports the low-latency audio paths in
   // combination with OpenSL ES.
   bool IsLowLatencyPlayoutSupported() const;
 
   // Returns the estimated total delay of this device. Unit is in milliseconds.
   // The vaule is set once at construction and never changes after that.
   // Possible values are webrtc::kLowLatencyModeDelayEstimateInMilliseconds and
   // webrtc::kHighLatencyModeDelayEstimateInMilliseconds.
   int GetDelayEstimateInMilliseconds() const;
 
+  int OutputStreamType() const { return output_stream_type_; }
+
  private:
   // Called from Java side so we can cache the native audio parameters.
   // This method will be called by the WebRtcAudioManager constructor, i.e.
   // on the same thread that this object is created on.
   static void JNICALL CacheAudioParameters(JNIEnv* env,
                                            jobject obj,
                                            jint sample_rate,
                                            jint channels,
                                            jboolean hardware_aec,
                                            jboolean hardware_agc,
                                            jboolean hardware_ns,
                                            jboolean low_latency_output,
                                            jint output_buffer_size,
                                            jint input_buffer_size,
+                                           jint output_stream_type,
                                            jlong native_audio_manager);
   void OnCacheAudioParameters(JNIEnv* env,
                               jint sample_rate,
                               jint channels,
                               jboolean hardware_aec,
                               jboolean hardware_agc,
                               jboolean hardware_ns,
                               jboolean low_latency_output,
                               jint output_buffer_size,
-                              jint input_buffer_size);
+                              jint input_buffer_size,
+                              jint output_stream_type);
 
   // Stores thread ID in the constructor.
   // We can then use ThreadChecker::CalledOnValidThread() to ensure that
   // other methods are called from the same thread.
   rtc::ThreadChecker thread_checker_;
 
   // Calls AttachCurrentThread() if this thread is not attached at construction.
   // Also ensures that DetachCurrentThread() is called at destruction.
   AttachCurrentThreadIfNeeded attach_thread_if_needed_;
 
@@ skipping 18 matching lines @@
   // True if device supports hardware (or built-in) NS.
   bool hardware_ns_;
 
   // True if device supports the low-latency OpenSL ES audio path.
   bool low_latency_playout_;
 
   // The delay estimate can take one of two fixed values depending on if the
   // device supports low-latency output or not.
   int delay_estimate_in_milliseconds_;
 
+  // Contains the output stream type provided to this class at construction by
+  // the AudioManager in Java land. Possible values are:
+  //  - AudioManager.STREAM_VOICE_CALL = 0
+  //  - AudioManager.STREAM_RING = 2
+  //  - AudioManager.STREAM_MUSIC = 3
+  int output_stream_type_;
+
   // Contains native parameters (e.g. sample rate, channel configuration).
   // Set at construction in OnCacheAudioParameters() which is called from
   // Java on the same thread as this object is created on.
   AudioParameters playout_parameters_;
   AudioParameters record_parameters_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_AUDIO_MANAGER_H_