diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-10-28 11:38:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 11:38:34 -0700 |
| commit | 42ea8dc732b8231df497a7a21fb3b55e1346fd63 (patch) | |
| tree | 564f3cafda2b9f4b27da38a1952b85f4d7808b95 /media | |
| parent | 5a7691f0e13620322103d61c9f2b1eeb908fd37b (diff) | |
| parent | adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd (diff) | |
| download | frameworks_base-42ea8dc732b8231df497a7a21fb3b55e1346fd63.zip frameworks_base-42ea8dc732b8231df497a7a21fb3b55e1346fd63.tar.gz frameworks_base-42ea8dc732b8231df497a7a21fb3b55e1346fd63.tar.bz2 | |
am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2
* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
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; |