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

am c78c1461: Merge "Partial fix for 4181654 hang in seeking after seeking to the end" into honeycomb-mr1

Browse Source 
* commit 'c78c1461df1e5b36374bb6f5a1da2090a5baba88':
  Partial fix for 4181654 hang in seeking after seeking to the end
This commit is contained in:
Jeffrey Tinker
2011-03-30 16:33:34 -07:00
committed by Android Git Automerger
parent 42af33c213 c78c1461df
commit 68d1266b52
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -195,6 +195,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
int64_t keyTime; int64_t keyTime;
bool syncFrame; bool syncFrame;
int retryLimit = 0;
// Pull full access units. Since we aren't sure how big they might be, // Pull full access units. Since we aren't sure how big they might be,
// start with initial buffer size, then allocate a larger buffer if we // start with initial buffer size, then allocate a larger buffer if we
@@ -233,9 +234,16 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
} }
if (bytesRead == 0) { if (bytesRead == 0) {
// Didn't get anything, sleep a bit so we don't hog the CPU then try again if (retryLimit++ >= 500) {
usleep(10000); // If no data received within the retry limit, return ERROR_IO
continue; // This prevents the player from becoming unresponsive
mediaBuf->release();
return ERROR_IO;
} else {
// Didn't get anything, sleep a bit so we don't hog the CPU then try again
usleep(10000);
continue;
}
} }
#define PCR_HZ 90000 #define PCR_HZ 90000