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

am 8e6d79e2: am 8445f367: Merge change Ibb9b1de1 into eclair

Browse Source 
Merge commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp

* commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477':
  1) Capture the start memory before the test started
This commit is contained in:
Yu Shan Emily Lau
2009-12-07 11:06:09 -08:00
committed by Android Git Automerger
parent f553a58425 8e6d79e2b5
commit a3d15d3b01
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,8 +315,11 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mEndMemory = getMediaserverVsize(); mEndMemory = getMediaserverVsize();
Log.v(TAG, "End Memory " + mEndMemory); Log.v(TAG, "End Memory " + mEndMemory);
output.write("End Memory :" + mEndMemory + "\n"); output.write("End Memory :" + mEndMemory + "\n");
//Write the total memory different into the output file int memDiff = mEndMemory - startMemory;
output.write("The total diff = " + (mEndMemory - startMemory)); if (memDiff < 0)
memDiff = 0;
else
output.write("The total diff = " + memDiff);
output.write("\n\n"); output.write("\n\n");
// mediaserver crash // mediaserver crash
if (startPid != mEndPid) { if (startPid != mEndPid) {
@ -324,7 +327,7 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
return false; return false;
} }
//memory leak greter than the tolerant //memory leak greter than the tolerant
if ((mEndMemory - startMemory) > MAX_ACCEPTED_MEMORY_LEAK_KB ) if (memDiff > MAX_ACCEPTED_MEMORY_LEAK_KB )
return false; return false;
return true; return true;
} }
@ -345,13 +348,11 @@ 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");
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263);
if (i == 0) {
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n"); output.write("Start memory : " + mStartMemory + "\n");
Log.v(TAG, "first mem : " + mStartMemory); Log.v(TAG, "first mem : " + mStartMemory);
} for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263);
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -369,12 +370,11 @@ 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");
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_H264_AMR);
if (i == 0) {
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n"); output.write("Start memory : " + mStartMemory + "\n");
} Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_H264_AMR);
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -392,12 +392,11 @@ 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");
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_WMV);
if (i == 0) {
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n"); output.write("Start memory : " + mStartMemory + "\n");
} Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
mediaStressPlayback(MediaNames.VIDEO_WMV);
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -416,13 +415,13 @@ 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);
if (i == 0) {
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
}
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -440,13 +439,13 @@ 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);
if (i == 0) {
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
}
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -465,13 +464,13 @@ 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);
if (i == 0) {
mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n");
}
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");
@ -489,12 +488,12 @@ 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");
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressAudioRecord(MediaNames.RECORDER_OUTPUT);
if (i == 0) {
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
output.write("Start memory : " + mStartMemory + "\n"); output.write("Start memory : " + mStartMemory + "\n");
} Log.v(TAG, "first mem : " + mStartMemory);
for (int i = 0; i < NUM_STRESS_LOOP; i++) {
stressAudioRecord(MediaNames.RECORDER_OUTPUT);
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
} }
output.write("\n"); output.write("\n");