Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4885 into donut

Browse Source 
* changes:
  Merge the output file into one.
This commit is contained in:
Android (Google) Code Review
2009-06-22 17:14:59 -07:00
parent 54f156c7c4 a74603052b
commit 11348cffef
1 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,23 +51,12 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
private SQLiteDatabase mDB; private SQLiteDatabase mDB;
private SurfaceHolder mSurfaceHolder = null; private SurfaceHolder mSurfaceHolder = null;
private static final int NUM_STRESS_LOOP = 10; private static final int NUM_STRESS_LOOP = 1;
private static final int NUM_PLAYBACk_IN_EACH_LOOP = 20; private static final int NUM_PLAYBACk_IN_EACH_LOOP = 2;
private static final long MEDIA_STRESS_WAIT_TIME = 5000; //5 seconds private static final long MEDIA_STRESS_WAIT_TIME = 5000; //5 seconds
private static final String H263_VIDEO_PLAYBACK_MEMOUT = private static final String MEDIA_MEMORY_OUTPUT =
"/sdcard/h263VideoPlaybackMemOut.txt"; "/sdcard/mediaMemOutput.txt";
private static final String H264_VIDEO_PLAYBACK_MEMOUT =
"/sdcard/h264VideoPlaybackMemOut.txt";
private static final String WMV_VIDEO_PLAYBACK_MEMOUT =
"/sdcard/WmvVideoPlaybackMemOut.txt";
private static final String H263_VIDEO_ONLY_RECORD_MEMOUT =
"/sdcard/recordH263VideoOnlyMemOut.txt";
private static final String MP4_VIDEO_ONLY_RECORD_MEMOUT =
"/sdcard/recordMPEG4VideoOnlyMemOut.txt";
private static final String H263_VIDEO_AUDIO_RECORD_MEMOUT =
"/sdcard/recordVideoH263AudioMemOut.txt";
private static final String AUDIO_ONLY_RECORD_MEMOUT =
"/sdcard/recordAudioOnlyMemOut.txt";
//the tolerant memory leak //the tolerant memory leak
private static final int MAX_ACCEPTED_MEMORY_LEAK_KB = 150; private static final int MAX_ACCEPTED_MEMORY_LEAK_KB = 150;
@@ -312,13 +301,18 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
return vsizevalue; return vsizevalue;
} }
public boolean validateMemoryResult(int startPid, int startMemory){ public boolean validateMemoryResult (int startPid, int startMemory, Writer output) throws Exception {
mEndPid = getMediaserverPid(); mEndPid = getMediaserverPid();
mEndMemory = getMediaserverVsize(); mEndMemory = getMediaserverVsize();
//Write the total memory different into the output file
output.write("The total diff = " + (mEndMemory - startMemory));
output.write("\n\n");
//mediaserver crash //mediaserver crash
if (startPid != mEndPid) if (startPid != mEndPid){
output.write("mediaserver died. Test failed\n");
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 ((mEndMemory - startMemory) > MAX_ACCEPTED_MEMORY_LEAK_KB )
return false; return false;
@@ -339,15 +333,17 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File h263MemoryOut = new File(H263_VIDEO_PLAYBACK_MEMOUT); File h263MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(h263MemoryOut)); Writer output = new BufferedWriter(new FileWriter(h263MemoryOut, true));
output.write("H263 Video Playback Only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("H263 playback memory test", memoryResult); assertTrue("H263 playback memory test", memoryResult);
} }
@@ -358,15 +354,17 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File h264MemoryOut = new File(H264_VIDEO_PLAYBACK_MEMOUT); File h264MemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(h264MemoryOut)); Writer output = new BufferedWriter(new FileWriter(h264MemoryOut, true));
output.write("H264 Video Playback only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("H264 playback memory test", memoryResult); assertTrue("H264 playback memory test", memoryResult);
} }
@@ -377,15 +375,17 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File wmvMemoryOut = new File(WMV_VIDEO_PLAYBACK_MEMOUT); File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut)); Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true));
output.write("WMV video playback only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("wmv playback memory test", memoryResult); assertTrue("wmv playback memory test", memoryResult);
} }
@@ -396,16 +396,18 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File videoH263RecordOnlyMemoryOut = new File(H263_VIDEO_ONLY_RECORD_MEMOUT); File videoH263RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut)); Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut, true));
output.write("H263 video record only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("H263 record only memory test", memoryResult); assertTrue("H263 record only memory test", memoryResult);
} }
@@ -416,16 +418,18 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File videoMp4RecordOnlyMemoryOut = new File(MP4_VIDEO_ONLY_RECORD_MEMOUT); File videoMp4RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut)); Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut, true));
output.write("MPEG4 video record only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("mpeg4 record only memory test", memoryResult); assertTrue("mpeg4 record only memory test", memoryResult);
} }
@@ -437,16 +441,18 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File videoRecordAudioMemoryOut = new File(H263_VIDEO_AUDIO_RECORD_MEMOUT); File videoRecordAudioMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut)); Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut, true));
output.write("Audio and h263 video record\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("H263 audio video record memory test", memoryResult); assertTrue("H263 audio video record memory test", memoryResult);
} }
@@ -457,15 +463,17 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
mStartPid = getMediaserverPid(); mStartPid = getMediaserverPid();
mStartMemory = getMediaserverVsize(); mStartMemory = getMediaserverVsize();
File audioOnlyMemoryOut = new File(AUDIO_ONLY_RECORD_MEMOUT); File audioOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);
Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut)); Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut, true));
output.write("Audio record only\n");
getMemoryWriteToLog(output); getMemoryWriteToLog(output);
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);
} }
output.write("\n");
memoryResult = validateMemoryResult(mStartPid, mStartMemory, output);
output.close(); output.close();
memoryResult = validateMemoryResult(mStartPid, mStartMemory);
assertTrue("audio record only memory test", memoryResult); assertTrue("audio record only memory test", memoryResult);
} }
} }