From a985135daa0d1706d8f62fa2d845590ce270e214 Mon Sep 17 00:00:00 2001 From: James Dong Date: Tue, 6 Sep 2011 18:48:50 -0700 Subject: [PATCH] Use device-dependent frame rate in the media recorder performance test Change-Id: I778eca69c4acb9842f600c6ae23e7a89fb2e55f4 related-to-bug: 5264298 --- .../performance/MediaPlayerPerformance.java | 31 ++++++++++++++++--- 1 file changed, 26 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 081064349ede5..0f7951516d418 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -26,6 +26,7 @@ import android.hardware.Camera; import android.hardware.Camera.PreviewCallback; import android.media.MediaPlayer; import android.media.MediaRecorder; +import android.media.EncoderCapabilities.VideoEncoderCap; import android.os.ConditionVariable; import android.os.Looper; import android.os.SystemClock; @@ -35,6 +36,7 @@ import android.test.suitebuilder.annotation.Suppress; import android.util.Log; import android.view.SurfaceHolder; +import java.util.List; import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -48,11 +50,12 @@ import java.io.BufferedWriter; import android.media.MediaMetadataRetriever; import com.android.mediaframeworktest.MediaProfileReader; -import android.hardware.Camera.PreviewCallback; - /** * Junit / Instrumentation - performance measurement for media player and * recorder + * + * FIXME: + * Add tests on H264 video encoder */ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2 { @@ -81,6 +84,8 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2 videoEncoders = MediaProfileReader.getVideoEncoders(); + Camera mCamera; public MediaPlayerPerformance() { @@ -360,6 +365,16 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2