diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-25 18:32:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 18:32:09 +0000 |
| commit | 376a8353901533268d21a0e2041c75cd9f2f04da (patch) | |
| tree | 2f90135e6d59b3c3ffd7039d60a39b30fb6ac2d1 /media | |
| parent | 8eb584988fde8e2018399a2444a6c04cf5b5c872 (diff) | |
| parent | 9a70c2c490afe35383c2226061af5a2f4e5b2109 (diff) | |
| download | frameworks_av-376a8353901533268d21a0e2041c75cd9f2f04da.zip frameworks_av-376a8353901533268d21a0e2041c75cd9f2f04da.tar.gz frameworks_av-376a8353901533268d21a0e2041c75cd9f2f04da.tar.bz2 | |
am 9a70c2c4: Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
* commit '9a70c2c490afe35383c2226061af5a2f4e5b2109':
Fix Widevine classic playback errors with NuPlayer
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index bd75034..f84decd 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; |