diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-10-28 12:44:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 12:44:28 -0700 |
| commit | f97dec837c1fa47250af023bbaea0566a0ec9695 (patch) | |
| tree | 71937b2548ba0cc53592d46f3290d6f636cb9e22 /media | |
| parent | 687545fc9ee79124229152df1236c53ba7d71215 (diff) | |
| parent | 42ea8dc732b8231df497a7a21fb3b55e1346fd63 (diff) | |
| download | frameworks_base-f97dec837c1fa47250af023bbaea0566a0ec9695.zip frameworks_base-f97dec837c1fa47250af023bbaea0566a0ec9695.tar.gz frameworks_base-f97dec837c1fa47250af023bbaea0566a0ec9695.tar.bz2 | |
am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp
* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
Fixed the H263 video duation which caused the incorrect video validation.
Diffstat (limited to 'media')
2 files changed, 2 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java index 9b7ff6c..3b69df8 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 @@ 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; } 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 @@ 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; |