diff options
author | Yu Shan Emily Lau <yslau@google.com> | 2013-09-16 12:50:12 -0700 |
---|---|---|
committer | Yu Shan Emily Lau <yslau@google.com> | 2013-09-16 12:50:12 -0700 |
commit | c10b55a5e4158c31410c7dab2656d46bc4544024 (patch) | |
tree | adad54ee65cbc87ae6f2f6c731ad272f1353306e /media/tests/MediaFrameworkTest | |
parent | dc6fd0a20a095ac0fb544184d8a4258e80b4a14d (diff) | |
download | frameworks_base-c10b55a5e4158c31410c7dab2656d46bc4544024.zip frameworks_base-c10b55a5e4158c31410c7dab2656d46bc4544024.tar.gz frameworks_base-c10b55a5e4158c31410c7dab2656d46bc4544024.tar.bz2 |
Fix media stress test.
1) Fix the CamcorderProifle initalization.
2) Insert 2 seconds after camera release.
Change-Id: Ib22f1922a917233f3d1020dc67de834e00fd0959
Diffstat (limited to 'media/tests/MediaFrameworkTest')
-rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java index 2d26ac7..7b2a20e 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -61,6 +61,7 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2<Med private SurfaceHolder mSurfaceHolder = null; private static final int NUM_STRESS_LOOP = 10; private static final int NUM_PLAYBACk_IN_EACH_LOOP = 20; + private static final int SHORT_WAIT = 2 * 1000; // 2 seconds private static final long MEDIA_STRESS_WAIT_TIME = 5000; //5 seconds private static final String MEDIA_MEMORY_OUTPUT = "/sdcard/mediaMemOutput.txt"; @@ -99,16 +100,17 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2<Med @Override protected void setUp() throws Exception { super.setUp(); + //Insert a 2 second before launching the test activity. This is + //the workaround for the race condition of requesting the updated surface. + Thread.sleep(SHORT_WAIT); + getActivity(); //Check if the device support the camcorder - CamcorderProfile mCamcorderProfile = CamcorderProfile.get(CAMERA_ID); + mCamcorderProfile = CamcorderProfile.get(CAMERA_ID); if (mCamcorderProfile != null) { mVideoWidth = mCamcorderProfile.videoFrameWidth; mVideoHeight = mCamcorderProfile.videoFrameHeight; + Log.v(TAG, "height = " + mVideoHeight + " width= " + mVideoWidth); } - //Insert a 2 second before launching the test activity. This is - //the workaround for the race condition of requesting the updated surface. - Thread.sleep(2000); - getActivity(); if (MediaFrameworkPerfTestRunner.mGetNativeHeapDump) MediaTestUtil.getNativeHeapDump(this.getName() + "_before"); @@ -246,6 +248,8 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2<Med Thread.sleep(MEDIA_STRESS_WAIT_TIME); mRecorder.stop(); mRecorder.release(); + //Insert 2 seconds to make sure the camera released. + Thread.sleep(SHORT_WAIT); } catch (Exception e) { Log.v("record video failed ", e.toString()); mRecorder.release(); |