widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support nonblocking reads for secure source (video)

Browse Source 
Bug: 15699665
Change-Id: If67c3196b42b24333ace1373711dc3f4eb30f0da
This commit is contained in:
Lajos Molnar
2014-07-17 11:39:01 -07:00
parent b8003f12b4
commit 174a218b30
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -222,7 +222,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
int retryLimit = 500; // Limit on number of retries before timeout, 10ms per retry int retryLimit = 500; // Limit on number of retries before timeout, 10ms per retry
ReadOptions::SeekMode mode; ReadOptions::SeekMode mode;
if (options && options->getSeekTo(&seekTimeUs, &mode)) { if (options != NULL && options->getSeekTo(&seekTimeUs, &mode)) {
// When doing a seek, use a longer timeout since we need to set up a new connection // When doing a seek, use a longer timeout since we need to set up a new connection
retryLimit = 1500; retryLimit = 1500;
@@ -258,9 +258,10 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
} }
} }
MediaBuffer *mediaBuf; MediaBuffer *mediaBuf = NULL;
status_t err = mGroup->acquire_buffer(&mediaBuf); status_t err = mGroup->acquire_buffer(
&mediaBuf, options != NULL && options->getNonBlocking());
if (err != OK) { if (err != OK) {
CHECK(mediaBuf == NULL); CHECK(mediaBuf == NULL);