am edd942c2: Merge change I55a6ac8c into eclair

Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp

* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
  Fixed the long recorder time and reduce the number of loops.
This commit is contained in:
Yu Shan Emily Lau
2009-09-29 22:13:57 -07:00
committed by Android Git Automerger
2 changed files with 4 additions and 4 deletions

View File

@ -40,7 +40,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_SHORT = 5;
private static final int NUMBER_OF_STRESS_LOOPS = 1000;
private static final int NUMBER_OF_STRESS_LOOPS = 500;
private static final int PLAYBACK_END_TOLERANCE = 5000;
private static final int WAIT_UNTIL_PLAYBACK_FINISH = 515000 ;

View File

@ -49,9 +49,9 @@ public class MediaRecorderStressTest extends ActivityInstrumentationTestCase2<Me
private static final int NUMBER_OF_RECORDERANDPLAY_STRESS_LOOPS = 50;
private static final int NUMBER_OF_SWTICHING_LOOPS_BW_CAMERA_AND_RECORDER = 200;
private static final long WAIT_TIME_CAMERA_TEST = 3000; // 3 second
private static final long WAIT_TIME_RECORDER_TEST = 60000; // 6 second
private static final long WAIT_TIME_RECORD = 100000; // 10 seconds
private static final long WAIT_TIME_PLAYBACK = 60000; // 6 second
private static final long WAIT_TIME_RECORDER_TEST = 6000; // 6 second
private static final long WAIT_TIME_RECORD = 10000; // 10 seconds
private static final long WAIT_TIME_PLAYBACK = 6000; // 6 second
private static final String OUTPUT_FILE = "/sdcard/temp";
private static final String OUTPUT_FILE_EXT = ".3gp";
private static final String MEDIA_STRESS_OUTPUT =