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

Commit 42ea8dc7 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

am adf4b4f5: Merge change I96458368 into eclair 

Merge commit 'adf4b4f5' into eclair-mr2

* commit 'adf4b4f5':
  Fixed the H263 video duation which caused the incorrect video validation.
parents 5a7691f0 adf4b4f5

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+1 −0
Original line number Diff line number Diff line
@@ -503,4 +503,5 @@ public class MediaNames { 
      "http://75.17.48.204:10088/yslau/stress_media/mpeg4_qvga_24fps.3gp";

  public static final int STREAM_H264_480_360_1411k_DURATION = 46000;

  public static final int VIDEO_H263_AAC_DURATION = 501000;

  public static final int VIDEO_H263_AMR_DURATION = 502000;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi 
        long randomseed = System.currentTimeMillis(); 

        Random generator = new Random(randomseed);

        Log.v(TAG, "Random seed: " + randomseed);

        int video_duration = MediaNames.VIDEO_H263_AAC_DURATION;

        int video_duration = MediaNames.VIDEO_H263_AMR_DURATION;

        int random_play_time = 0;

        int random_seek_time = 0;

        int random_no_of_seek = 0;