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

Merge "Fix an intermittent issue with HLS live streaming"

Browse Source
This commit is contained in:
Jeff Tinker
2012-04-05 12:02:45 -07:00
committed by Android (Google) Code Review
parent e612ce59c4 ba32a8ddb8
commit 83be76c303
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proprietary/wvm/WVMExtractorImpl.cpp
View File

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

8
proprietary/wvm/WVMMediaSource.cpp
View File

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