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

Commit a64e5145 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 63b7c275 60d5b2e8

media/tests/MediaTranscodingTest/src/com/android/mediatranscodingtest/MediaTranscodingBenchmark.java

+12 −25
Original line number Diff line number Diff line
@@ -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 {