Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 59ac0b14: Merge "Handle unknown duration in playMediaSamples test" into mnc-dev

Browse Source 
* commit '59ac0b14f2c67d502d7bad807d954f9a91ee43ac':
  Handle unknown duration in playMediaSamples test
This commit is contained in:
Marco Nelissen
2015-05-27 23:17:23 +00:00
committed by Android Git Automerger
parent 214b48e6ff 59ac0b14f2
commit 18d205f0f5
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java
View File

@@ -823,13 +823,20 @@ public class CodecTest {
duration = mMediaPlayer.getDuration();
// start to play
mMediaPlayer.start();
waittime = duration - mMediaPlayer.getCurrentPosition();
synchronized(onCompletion){
try {
onCompletion.wait(waittime + buffertime);
}catch (Exception e) {
Log.v(TAG, "playMediaSamples are interrupted");
return false;
if (duration < 0) {
Log.w(TAG, filePath + " has unknown duration, waiting until playback completes");
while (mMediaPlayer.isPlaying()) {
SystemClock.sleep(1000);
}
} else {
waittime = duration - mMediaPlayer.getCurrentPosition();
synchronized(onCompletion){
try {
onCompletion.wait(waittime + buffertime);
} catch (Exception e) {
Log.v(TAG, "playMediaSamples are interrupted");
return false;
}
}
}
terminateMessageLooper();