Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 859c3754 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

am bd014e07: Remove the memory capture in the first run and make it the same... 

am bd014e07: Remove the memory capture in the first run and make it the same as the cupcake test case.

Merge commit 'bd014e07'

* commit 'bd014e07':
  Remove the memory capture in the first run and make it the same as the cupcake test case.
parents 9d1a3149 bd014e07

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

+0 −7
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File h263MemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(h263MemoryOut, true));

        output.write("H263 Video Playback Only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            mediaStressPlayback(MediaNames.VIDEO_HIGHRES_H263);

            getMemoryWriteToLog(output);
@@ -363,7 +362,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File h264MemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(h264MemoryOut, true));

        output.write("H264 Video Playback only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            mediaStressPlayback(MediaNames.VIDEO_H264_AMR);

            getMemoryWriteToLog(output);
@@ -384,7 +382,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true));

        output.write("WMV video playback only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            mediaStressPlayback(MediaNames.VIDEO_WMV);

            getMemoryWriteToLog(output);
@@ -405,7 +402,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File videoH263RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(videoH263RecordOnlyMemoryOut, true));

        output.write("H263 video record only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,

                    MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
@@ -427,7 +423,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File videoMp4RecordOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(videoMp4RecordOnlyMemoryOut, true));

        output.write("MPEG4 video record only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.MPEG_4_SP,

                    MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, true);
@@ -450,7 +445,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File videoRecordAudioMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(videoRecordAudioMemoryOut, true));

        output.write("Audio and h263 video record\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            stressVideoRecord(20, 352, 288, MediaRecorder.VideoEncoder.H263,

                    MediaRecorder.OutputFormat.MPEG_4, MediaNames.RECORDED_VIDEO_3GP, false);
@@ -472,7 +466,6 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
        File audioOnlyMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

        Writer output = new BufferedWriter(new FileWriter(audioOnlyMemoryOut, true));

        output.write("Audio record only\n");

        getMemoryWriteToLog(output);

        for (int i = 0; i < NUM_STRESS_LOOP; i++) {

            stressAudioRecord(MediaNames.RECORDER_OUTPUT);

            getMemoryWriteToLog(output);