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

Merge "transcoding: Enable the benchmark for video file with audio."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-28 18:20:32 +00:00
committed by Android (Google) Code Review
parent 63b7c27592 60d5b2e8e0
commit a64e5145ea
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java
View File

@@ -132,9 +132,9 @@ public class MediaTranscodingBenchmark
Log.d(TAG,
"Transcoding completed with result: " + transcodingJob.getResult());
assertEquals(transcodingJob.getResult(), TranscodingJob.RESULT_SUCCESS);
transcodeCompleteSemaphore.release();
transcodingTime.set(System.currentTimeMillis() - startTimeMs);
totalTimeMs.addAndGet(transcodingTime.get());
transcodeCompleteSemaphore.release();
});
if (job != null) {
@@ -173,9 +173,6 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/*
@Test
public void testBenchmarkingAVCToAVCWith66FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_66frame_h264_22Mbps_30fps_aac";
@@ -183,7 +180,7 @@ public class MediaTranscodingBenchmark
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
}*/
}
@Test
public void testBenchmarkingAVCToAVCWith361FramesWithoutAudio() throws Exception {
@@ -194,16 +191,14 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/*@Test
@Test
public void testBenchmarkingAVCToAVCWith361FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_361frame_h264_22Mbps_30fps_aac";
String testVideoName = videoNameWithoutExtension + ".mp4";
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
}*/
}
@Test
public void testBenchmarkingAVCToAVCWith943FramesWithoutAudio() throws Exception {
@@ -214,16 +209,14 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/* @Test
@Test
public void testBenchmarkingAVCToAVCWith943FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_943frame_h264_22Mbps_30fps_aac";
String testVideoName = videoNameWithoutExtension + ".mp4";
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
}*/
}
@Test
public void testBenchmarkingAVCToAVCWith1822FramesWithoutAudio() throws Exception {
@@ -234,16 +227,14 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/*@Test
@Test
public void testBenchmarkingAVCToAVCWith1822FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_1822frame_h264_22Mbps_30fps_aac";
String testVideoName = videoNameWithoutExtension + ".mp4";
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
}*/
}
@Test
public void testBenchmarkingAVCToAVCWith3648FramesWithoutAudio() throws Exception {
@@ -254,16 +245,14 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/*@Test
@Test
public void testBenchmarkingAVCToAVCWith3648FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_3648frame_h264_22Mbps_30fps_aac";
String testVideoName = videoNameWithoutExtension + ".mp4";
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
}*/
}
@Test
public void testBenchmarkingAVCToAVCWith11042FramesWithoutAudio() throws Exception {
@@ -274,16 +263,14 @@ public class MediaTranscodingBenchmark
transcode(testVideoName, transcodedVideoName);
}
// TODO(hkuang): Enable this after b/160268606 is fixed. Transcoding video with audio takes way
// more long time that leads to timeout failure.
/*@Test
@Test
public void testBenchmarkingAVCToAVCWith11042FramesWithAudio() throws Exception {
String videoNameWithoutExtension = "video_1920x1080_11042frame_h264_22Mbps_30fps_aac";
String testVideoName = videoNameWithoutExtension + ".mp4";
String transcodedVideoName = videoNameWithoutExtension + "_transcode.mp4";
transcode(testVideoName, transcodedVideoName);
} */
}
@Test
public void testBenchmarkingHEVCToAVCWith107FramesWithoutAudio() throws Exception {