Exclude Nexus 6 from OpenSL ES usage

webrtc/modules/audio_device/android/audio_manager.cc

 /*
  *  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 16 matching lines @@
 
 namespace webrtc {
 
 // AudioManager::JavaAudioManager implementation
 AudioManager::JavaAudioManager::JavaAudioManager(
     NativeRegistration* native_reg, rtc::scoped_ptr<GlobalRef> audio_manager)
     : audio_manager_(audio_manager.Pass()),
       init_(native_reg->GetMethodId("init", "()Z")),
       dispose_(native_reg->GetMethodId("dispose", "()V")),
       is_communication_mode_enabled_(
-          native_reg->GetMethodId("isCommunicationModeEnabled", "()Z")) {
+          native_reg->GetMethodId("isCommunicationModeEnabled", "()Z")),
+      is_device_blacklisted_for_open_sles_usage_(
+          native_reg->GetMethodId(
+              "isDeviceBlacklistedForOpenSLESUsage", "()Z")) {
   ALOGD("JavaAudioManager::ctor%s", GetThreadInfo().c_str());
 }
 
 AudioManager::JavaAudioManager::~JavaAudioManager() {
   ALOGD("JavaAudioManager::dtor%s", GetThreadInfo().c_str());
 }
 
 bool AudioManager::JavaAudioManager::Init() {
   return audio_manager_->CallBooleanMethod(init_);
 }
 
 void AudioManager::JavaAudioManager::Close() {
   audio_manager_->CallVoidMethod(dispose_);
 }
 
 bool AudioManager::JavaAudioManager::IsCommunicationModeEnabled() {
   return audio_manager_->CallBooleanMethod(is_communication_mode_enabled_);
 }
 
+bool AudioManager::JavaAudioManager::IsDeviceBlacklistedForOpenSLESUsage() {
+  return audio_manager_->CallBooleanMethod(
+      is_device_blacklisted_for_open_sles_usage_);
+}
+
 // AudioManager implementation
 AudioManager::AudioManager()
     : j_environment_(JVM::GetInstance()->environment()),
       audio_layer_(AudioDeviceModule::kPlatformDefaultAudio),
       initialized_(false),
       hardware_aec_(false),
       low_latency_playout_(false),
       delay_estimate_in_milliseconds_(0) {
   ALOGD("ctor%s", GetThreadInfo().c_str());
   CHECK(j_environment_);
@@ skipping 65 matching lines @@
 }
 
 bool AudioManager::IsAcousticEchoCancelerSupported() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return hardware_aec_;
 }
 
 bool AudioManager::IsLowLatencyPlayoutSupported() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   ALOGD("IsLowLatencyPlayoutSupported()");
-  // TODO(henrika): enable again once issue in b/21485703 has been sorted out.
-  // This is just a temporary fix.
-  ALOGW("NOTE: OpenSL ES output is currently disabled!");
-  return false;
+  // Some devices are blacklisted for usage of OpenSL ES even if they report
+  // that low-latency playout is supported. See b/21485703 for details.
+  return j_audio_manager_->IsDeviceBlacklistedForOpenSLESUsage() ?
+      false : low_latency_playout_;
 }
 
 int AudioManager::GetDelayEstimateInMilliseconds() const {
   return delay_estimate_in_milliseconds_;
 }
 
 void JNICALL AudioManager::CacheAudioParameters(JNIEnv* env,
                                                 jobject obj,
                                                 jint sample_rate,
                                                 jint channels,
@@ skipping 37 matching lines @@
   return playout_parameters_;
 }
 
 const AudioParameters& AudioManager::GetRecordAudioParameters() {
   CHECK(record_parameters_.is_valid());
   DCHECK(thread_checker_.CalledOnValidThread());
   return record_parameters_;
 }
 
 }  // namespace webrtc