drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Idcaa1ef8 into eclair

Browse Source 
* changes:
  1) Add 10 seconds wait time before collecting the end memory. 2) Modified the player stress test, shorten the plabyack time.
This commit is contained in:
Android (Google) Code Review
2009-10-16 18:06:43 -04:00
parent d8f7a0e3de 999101368f
commit da2ecbebd2
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
View File

@ -309,6 +309,8 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
} }
public boolean validateMemoryResult (int startPid, int startMemory, Writer output) throws Exception { public boolean validateMemoryResult (int startPid, int startMemory, Writer output) throws Exception {
//Wait for 10 seconds to make sure the memory settle.
Thread.sleep(10000);
mEndPid = getMediaserverPid(); mEndPid = getMediaserverPid();
mEndMemory = getMediaserverVsize(); mEndMemory = getMediaserverVsize();
Log.v(TAG, "End Memory " + mEndMemory); Log.v(TAG, "End Memory " + mEndMemory);

18
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
View File

@ -41,7 +41,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY = 10; private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY = 10;
private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY_SHORT = 5; private static final int NUMBER_OF_RANDOM_REPOSITION_AND_PLAY_SHORT = 5;
private static final int NUMBER_OF_STRESS_LOOPS = 500; private static final int NUMBER_OF_STRESS_LOOPS = 500;
private static final int PLAYBACK_END_TOLERANCE = 5000; private static final int PLAYBACK_END_TOLERANCE = 30000;
private static final int WAIT_UNTIL_PLAYBACK_FINISH = 515000 ; private static final int WAIT_UNTIL_PLAYBACK_FINISH = 515000 ;
public MediaPlayerStressTest() { public MediaPlayerStressTest() {
@ -112,10 +112,11 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
if (random_no_of_seek == 0) { if (random_no_of_seek == 0) {
random_no_of_seek = 1; random_no_of_seek = 1;
} }
// Random seek and play Log.v(TAG, "random_seek = " + random_no_of_seek);
// Play for 10 seconds then random seekTo
for (int j = 0; j < random_no_of_seek; j++) { for (int j = 0; j < random_no_of_seek; j++) {
random_play_time = random_play_time =
generator.nextInt(video_duration / 2); generator.nextInt(video_duration / 100);
Log.v(TAG, "Play time = " + random_play_time); Log.v(TAG, "Play time = " + random_play_time);
Thread.sleep(random_play_time); Thread.sleep(random_play_time);
random_seek_time = random_seek_time =
@ -123,12 +124,13 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
Log.v(TAG, "Seek time = " + random_seek_time); Log.v(TAG, "Seek time = " + random_seek_time);
mp.seekTo(random_seek_time); mp.seekTo(random_seek_time);
} }
//wait until the movie finish and check the current position //Seek to 10s from the end of the video
//Make sure the wait time is long enough mp.seekTo(video_duration - 10000);
long wait_until_playback_finish = video_duration - random_seek_time + PLAYBACK_END_TOLERANCE * 2; //After reposition, play 30 seconds the video should be finished.
Thread.sleep(wait_until_playback_finish); Thread.sleep(PLAYBACK_END_TOLERANCE);
Log.v(TAG, "CurrentPosition = " + mp.getCurrentPosition()); Log.v(TAG, "CurrentPosition = " + mp.getCurrentPosition());
if ( mp.isPlaying() || mp.getCurrentPosition() > (video_duration + PLAYBACK_END_TOLERANCE)){ if ( mp.isPlaying() || mp.getCurrentPosition()
> (video_duration)){
assertTrue("Current PlayTime greater than duration", false); assertTrue("Current PlayTime greater than duration", false);
} }
mp.release(); mp.release();