diff options
author | Yu Shan Emily Lau <yslau@google.com> | 2009-09-25 00:07:47 -0700 |
---|---|---|
committer | Yu Shan Emily Lau <yslau@google.com> | 2009-09-25 00:07:47 -0700 |
commit | a56e653130f2253edb97fe3a5feb18789c29ec9e (patch) | |
tree | 529c5971b427b1833fdbf8c49760eb36b79c1d61 /media/tests/MediaFrameworkTest | |
parent | 5b0b63b67489ae3fb14ad2fb000f0ad8977f8f30 (diff) | |
download | frameworks_base-a56e653130f2253edb97fe3a5feb18789c29ec9e.zip frameworks_base-a56e653130f2253edb97fe3a5feb18789c29ec9e.tar.gz frameworks_base-a56e653130f2253edb97fe3a5feb18789c29ec9e.tar.bz2 |
Added the checking for the wma in the memory test.
Diffstat (limited to 'media/tests/MediaFrameworkTest')
-rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java | 32 |
1 files changed, 17 insertions, 15 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 01c0920..0ae354a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -40,6 +40,7 @@ import java.io.FileWriter; import java.io.BufferedWriter; import android.media.MediaMetadataRetriever; +import com.android.mediaframeworktest.MediaProfileReader; /** * Junit / Instrumentation - performance measurement for media player and @@ -384,23 +385,24 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi @LargeTest public void testWMVVideoPlaybackMemoryUsage() throws Exception { boolean memoryResult = false; - mStartPid = getMediaserverPid(); - - File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT); - Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true)); - output.write("WMV video playback only\n"); - for (int i = 0; i < NUM_STRESS_LOOP; i++) { - mediaStressPlayback(MediaNames.VIDEO_WMV); - if (i == 0) { - mStartMemory = getMediaserverVsize(); - output.write("Start memory : " + mStartMemory + "\n"); + if (MediaProfileReader.getWMVEnable()){ + mStartPid = getMediaserverPid(); + File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT); + Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true)); + output.write("WMV video playback only\n"); + for (int i = 0; i < NUM_STRESS_LOOP; i++) { + mediaStressPlayback(MediaNames.VIDEO_WMV); + if (i == 0) { + mStartMemory = getMediaserverVsize(); + output.write("Start memory : " + mStartMemory + "\n"); + } + getMemoryWriteToLog(output); } - getMemoryWriteToLog(output); + output.write("\n"); + memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); + output.close(); + assertTrue("wmv playback memory test", memoryResult); } - output.write("\n"); - memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); - output.close(); - assertTrue("wmv playback memory test", memoryResult); } // Test case 4: Capture the memory usage after every 20 video only recorded |