Merge "Fix an intermittent issue with HLS live streaming"

proprietary/wvm/WVMExtractorImpl.cpp

@@ -480,6 +480,10 @@ int64_t WVMExtractorImpl::getCachedDurationUs(status_t *finalStatus) {
     } else if (status != WV_Status_OK) {
         *finalStatus = ERROR_IO;
     } else {
+        if (mIsLiveStream)
+            *finalStatus = ERROR_END_OF_STREAM;
+        else
+            *finalStatus = OK;
         durationUs = (uint64_t)(secondsBuffered * 1000000LL);
     }
 

proprietary/wvm/WVMMediaSource.cpp

@@ -335,9 +335,11 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
             break;
 
 #ifdef REQUIRE_SECURE_BUFFERS
-        ALOGD("buffer overflow");
-        mediaBuf->release();
-        return ERROR_IO;
+        if (!mIsLiveStream) {
+            ALOGD("buffer overflow");
+            mediaBuf->release();
+            return ERROR_IO;
+        }
 #endif
 
         //ALOGD("Resizing...");