drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27011 into eclair

Browse Source 
* changes:
  Added the checking for the wma in the memory test.
This commit is contained in:
Android (Google) Code Review
2009-09-25 03:31:28 -04:00
parent fdf53a4628 a56e653130
commit 3f790d8783
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
View File

@ -40,6 +40,7 @@ import java.io.FileWriter;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import com.android.mediaframeworktest.MediaProfileReader;
/** /**
* Junit / Instrumentation - performance measurement for media player and * Junit / Instrumentation - performance measurement for media player and
@ -384,23 +385,24 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
@LargeTest @LargeTest
public void testWMVVideoPlaybackMemoryUsage() throws Exception { public void testWMVVideoPlaybackMemoryUsage() throws Exception {
boolean memoryResult = false; boolean memoryResult = false;
mStartPid = getMediaserverPid(); if (MediaProfileReader.getWMVEnable()){
mStartPid = getMediaserverPid();
File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT); File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true));
output.write("WMV video playback only\n"); output.write("WMV video playback only\n");
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_WMV); mediaStressPlayback(MediaNames.VIDEO_WMV);
if (i == 0) { if (i == 0) {
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n"); 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 // Test case 4: Capture the memory usage after every 20 video only recorded