From: Jeff Tinker <jtinker@google.com>
Date: Wed, 24 Sep 2014 05:24:26 +0000 (-0700)
Subject: Fix Widevine classic playback errors with NuPlayer
X-Git-Tag: android-x86-6.0-r1~852^2~284^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a28785aa9ce323494a6971a38ce1d4d29bf710e4;p=android-x86%2Fframeworks-av.git

Fix Widevine classic playback errors with NuPlayer

bug: 17589961
Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
---

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index bd75034887..f84decdaa3 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1198,10 +1198,17 @@ void NuPlayer::GenericSource::readBuffer(
     switch (trackType) {
         case MEDIA_TRACK_TYPE_VIDEO:
             track = &mVideoTrack;
+            if (mIsWidevine) {
+                maxBuffers = 2;
+            }
             break;
         case MEDIA_TRACK_TYPE_AUDIO:
             track = &mAudioTrack;
-            maxBuffers = 64;
+            if (mIsWidevine) {
+                maxBuffers = 8;
+            } else {
+                maxBuffers = 64;
+            }
             break;
         case MEDIA_TRACK_TYPE_SUBTITLE:
             track = &mSubtitleTrack;