diff options
| author | Marco Nelissen <marcone@google.com> | 2015-05-27 23:05:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-27 23:05:15 +0000 |
| commit | 59ac0b14f2c67d502d7bad807d954f9a91ee43ac (patch) | |
| tree | 18eaeccde68342cfcb1c595ea44b819612fda704 /media | |
| parent | 7c9d94404fe9196e1f75fd56ff55624343c88ebd (diff) | |
| parent | e796ff912ecae57d8cb34c9366b3596fc1029fd8 (diff) | |
| download | frameworks_base-59ac0b14f2c67d502d7bad807d954f9a91ee43ac.zip frameworks_base-59ac0b14f2c67d502d7bad807d954f9a91ee43ac.tar.gz frameworks_base-59ac0b14f2c67d502d7bad807d954f9a91ee43ac.tar.bz2 | |
Merge "Handle unknown duration in playMediaSamples test" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java index 66ed933..bcfcbf3 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java @@ -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(); |