Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edd942c2 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I55a6ac8c into eclair 

* changes:
  Fixed the long recorder time and reduce the number of loops.
parents 2a35c8d7 55a6ac8c

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

+1 −1
Original line number Diff line number Diff line
@@ -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 ;

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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 =