diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-25 03:24:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 03:24:23 +0000 |
| commit | 9a70c2c490afe35383c2226061af5a2f4e5b2109 (patch) | |
| tree | 8cce6248e2be255df2f44e900172a89fc993f736 /media | |
| parent | a935c76f96b066941b34f81c42b3fe9d00db98c5 (diff) | |
| parent | a28785aa9ce323494a6971a38ce1d4d29bf710e4 (diff) | |
| download | frameworks_av-9a70c2c490afe35383c2226061af5a2f4e5b2109.zip frameworks_av-9a70c2c490afe35383c2226061af5a2f4e5b2109.tar.gz frameworks_av-9a70c2c490afe35383c2226061af5a2f4e5b2109.tar.bz2 | |
Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-dev
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; |