| commit | 79e56a215ece6bd51026b4ffde10cb33c4b4a461 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Wed Oct 28 23:53:27 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 28 23:53:27 2009 -0700 |
| tree | 64da26052b74361f91717ea619cf63c173391801 | |
| parent | 52fc3989c5774523f1dd9c723068fa33e37ea69d [diff] | |
| parent | f97dec837c1fa47250af023bbaea0566a0ec9695 [diff] |
am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695' * commit 'f97dec837c1fa47250af023bbaea0566a0ec9695': Fixed the H263 video duation which caused the incorrect video validation.
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java index 9b7ff6c..3b69df898 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
@@ -503,4 +503,5 @@ "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; }
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java index daa0ca7..fdb43da 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
@@ -94,7 +94,7 @@ 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;