From 174a218b30e9372fca47a8a672678e2d691d0304 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Thu, 17 Jul 2014 11:39:01 -0700 Subject: [PATCH] Support nonblocking reads for secure source (video) Bug: 15699665 Change-Id: If67c3196b42b24333ace1373711dc3f4eb30f0da --- proprietary/wvm/WVMMediaSource.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp index 9a59250f..0fb551d6 100644 --- a/proprietary/wvm/WVMMediaSource.cpp +++ b/proprietary/wvm/WVMMediaSource.cpp @@ -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 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 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) { CHECK(mediaBuf == NULL);