Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am adf4b4f5: Merge change I96458368 into eclair

Browse Source 
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
This commit is contained in:
Yu Shan Emily Lau
2009-10-28 11:38:34 -07:00
committed by Android Git Automerger
parent 5a7691f0e1 adf4b4f5cd
commit 42ea8dc732
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
View File

@@ -503,4 +503,5 @@ public class MediaNames {
"http://75.17.48.204:10088/yslau/stress_media/mpeg4_qvga_24fps.3gp"; "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 STREAM_H264_480_360_1411k_DURATION = 46000;
public static final int VIDEO_H263_AAC_DURATION = 501000; public static final int VIDEO_H263_AAC_DURATION = 501000;
public static final int VIDEO_H263_AMR_DURATION = 502000;
} }

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

@@ -94,7 +94,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
long randomseed = System.currentTimeMillis(); long randomseed = System.currentTimeMillis();
Random generator = new Random(randomseed); Random generator = new Random(randomseed);
Log.v(TAG, "Random seed: " + 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_play_time = 0;
int random_seek_time = 0; int random_seek_time = 0;
int random_no_of_seek = 0; int random_no_of_seek = 0;