From 48584d7b8f5e56b73bb13180bf6546b2647c1b28 Mon Sep 17 00:00:00 2001 From: Yu Shan Emily Lau Date: Tue, 25 May 2010 14:13:10 -0700 Subject: Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200. Change-Id: I5a0278095155afd669ffee9bd599ddfffdcc42bf --- .../MediaRecorderStressTestRunner.java | 59 +++++++++++++++++++++ .../performance/MediaPlayerPerformance.java | 26 ++++----- .../stress/MediaRecorderStressTest.java | 61 +++++++++++++++++++--- 3 files changed, 126 insertions(+), 20 deletions(-) diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java index ae9e102c10b4..3e46e27a80ab 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaRecorderStressTestRunner.java @@ -16,6 +16,8 @@ package com.android.mediaframeworktest; +import android.media.MediaRecorder; +import android.os.Bundle; import android.test.InstrumentationTestRunner; import android.test.InstrumentationTestSuite; import com.android.mediaframeworktest.stress.MediaRecorderStressTest; @@ -25,6 +27,17 @@ import junit.framework.TestSuite; public class MediaRecorderStressTestRunner extends InstrumentationTestRunner { + // Default recorder settings + public static int mIterations = 100; + public static int mVideoEncoder = MediaRecorder.VideoEncoder.H263; + public static int mAudioEncdoer = MediaRecorder.AudioEncoder.AMR_NB; + public static int mFrameRate = 20; + public static int mVideoWidth = 352; + public static int mVideoHeight = 288; + public static int mBitRate = 100; + public static boolean mRemoveVideo = true; + public static int mDuration = 10000; + @Override public TestSuite getAllTests() { TestSuite suite = new InstrumentationTestSuite(this); @@ -37,4 +50,50 @@ public class MediaRecorderStressTestRunner extends InstrumentationTestRunner { public ClassLoader getLoader() { return MediaRecorderStressTestRunner.class.getClassLoader(); } + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + String iterations = (String) icicle.get("iterations"); + String video_encoder = (String) icicle.get("video_encoder"); + String audio_encoder = (String) icicle.get("audio_encoder"); + String frame_rate = (String) icicle.get("frame_rate"); + String video_width = (String) icicle.get("video_width"); + String video_height = (String) icicle.get("video_height"); + String bit_rate = (String) icicle.get("bit_rate"); + String record_duration = (String) icicle.get("record_duration"); + String remove_videos = (String) icicle.get("remove_videos"); + + if (iterations != null ) { + mIterations = Integer.parseInt(iterations); + } + if ( video_encoder != null) { + mVideoEncoder = Integer.parseInt(video_encoder); + } + if ( audio_encoder != null) { + mAudioEncdoer = Integer.parseInt(audio_encoder); + } + if (frame_rate != null) { + mFrameRate = Integer.parseInt(frame_rate); + } + if (video_width != null) { + mVideoWidth = Integer.parseInt(video_width); + } + if (video_height != null) { + mVideoHeight = Integer.parseInt(video_height); + } + if (bit_rate != null) { + mBitRate = Integer.parseInt(bit_rate); + } + if (record_duration != null) { + mDuration = Integer.parseInt(record_duration); + } + if (remove_videos != null) { + if (remove_videos.compareTo("true") == 0) { + mRemoveVideo = true; + } else { + mRemoveVideo = false; + } + } + } } 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 265228155c3f..a0ef90532cd1 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -237,18 +237,20 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase