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

am b1780474: Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair

Browse Source 
Merge commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f' into eclair-plus-aosp

* commit 'b1780474e6e3e1d3c584166c2fde336a0cd1c43f':
  Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player.
This commit is contained in:
Yu Shan Emily Lau
2010-01-21 15:14:36 -08:00
committed by Android Git Automerger
parent ad0e536355 b1780474e6
commit 47f1d4d509
1 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,13 +255,19 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
} }
//Write the ps output to the file //Write the ps output to the file
public void getMemoryWriteToLog(Writer output) { public void getMemoryWriteToLog(Writer output, int writeCount) {
String memusage = null; String memusage = null;
memusage = captureMediaserverInfo();
Log.v(TAG, memusage);
try { try {
//Write to file output if (writeCount == 0) {
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
}
memusage = captureMediaserverInfo();
output.write(memusage); output.write(memusage);
if (writeCount == NUM_STRESS_LOOP - 1) {
mEndMemory = getMediaserverVsize();
output.write("End Memory :" + mEndMemory + "\n");
}
} catch (Exception e) { } catch (Exception e) {
e.toString(); e.toString();
} }
@ -312,9 +318,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
//Wait for 10 seconds to make sure the memory settle. //Wait for 10 seconds to make sure the memory settle.
Thread.sleep(10000); Thread.sleep(10000);
mEndPid = getMediaserverPid(); mEndPid = getMediaserverPid();
mEndMemory = getMediaserverVsize();
Log.v(TAG, "End Memory " + mEndMemory);
output.write("End Memory :" + mEndMemory + "\n");
int memDiff = mEndMemory - startMemory; int memDiff = mEndMemory - startMemory;
if (memDiff < 0) if (memDiff < 0)
memDiff = 0; memDiff = 0;
@ -348,12 +351,9 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File h263MemoryOut = new File(MEDIA_MEMORY_OUTPUT); File h263MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(h263MemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(h263MemoryOut, true));
output.write("H263 Video Playback Only\n"); output.write("H263 Video Playback Only\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263); mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -370,12 +370,9 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File h264MemoryOut = new File(MEDIA_MEMORY_OUTPUT); File h264MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(h264MemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(h264MemoryOut, true));
output.write("H264 Video Playback only\n"); output.write("H264 Video Playback only\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_H264_AMR); mediaStressPlayback(MediaNames.VIDEO_H264_AMR);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -392,12 +389,9 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
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");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
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);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -415,14 +409,10 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File videoH263RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT); File videoH263RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut, true));
output.write("H263 video record only\n"); output.write("H263 video record only\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263, stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,
MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true); MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -439,14 +429,10 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File videoMp4RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT); File videoMp4RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut, true));
output.write("MPEG4 video record only\n"); output.write("MPEG4 video record only\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.MPEG_4_SP, stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.MPEG_4_SP,
MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true); MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -464,14 +450,10 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File videoRecordAudioMemoryOut = new File(MEDIA_MEMORY_OUTPUT); File videoRecordAudioMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut, true));
output.write("Audio and h263 video record\n"); output.write("Audio and h263 video record\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263, stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,
MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, false); MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, false);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
@ -488,13 +470,9 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
File audioOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT); File audioOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut, true)); Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut, true));
output.write("Audio record only\n"); output.write("Audio record only\n");
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) { for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressAudioRecord(MediaNames.RECORDER_OUTPUT); stressAudioRecord(MediaNames.RECORDER_OUTPUT);
getMemoryWriteToLog(output); getMemoryWriteToLog(output, i);
} }
output.write("\n"); output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output); memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);