commit 946bdb362d8bd54afd95c1270c1b6905a298f331
author Dongwon Kang <dwkang@google.com> Wed Nov 14 10:12:00 2018 -0800
committer Dongwon Kang <dwkang@google.com> Wed Nov 14 16:19:04 2018 -0800
tree c50396c7dec306f3f44303b83a25409f55243988
parent 54cbc29870372ef9d5763c2a86d86508bc351d1b

MediaPlayer2: use AudioManager.isOffloadedPlaybackSupported

Test: MediaPlayer2Test
Bug: 112549970
Change-Id: I85c689b029a82122ff148c381a021657db2893d4

media/libmediaplayer2/nuplayer2/NuPlayer2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
index c37460b..fef9fae 100644
--- a/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2.cpp
@@ -24,6 +24,7 @@
 #include "NuPlayer2.h"
 
 #include "HTTPLiveSource2.h"
+#include "JMediaPlayer2Utils.h"
 #include "NuPlayer2CCDecoder.h"
 #include "NuPlayer2Decoder.h"
 #include "NuPlayer2DecoderBase.h"
@@ -1699,7 +1700,8 @@
     }
 
     mOffloadAudio =
-        canOffloadStream(audioMeta, hasVideo, mCurrentSourceInfo.mSource->isStreaming(), streamType)
+        JMediaPlayer2Utils::isOffloadedAudioPlaybackSupported(
+                audioMeta, hasVideo, mCurrentSourceInfo.mSource->isStreaming(), streamType)
                 && (mPlaybackSettings.mSpeed == 1.f && mPlaybackSettings.mPitch == 1.f);
 
     // Modular DRM: Disabling audio offload if the source is protected