From f19a9129ba5abd3e929ae0575f65537ccd108d82 Mon Sep 17 00:00:00 2001 From: cruizba Date: Tue, 11 Feb 2025 02:28:22 +0100 Subject: [PATCH] openvidu-test-e2e: Improve CPU performance by using losless codec ffv1 and flac. Fix some tests also because of mp3 used as source instead of flac. --- .../java/io/openvidu/test/e2e/OpenViduTestE2e.java | 12 ++++++------ .../io/openvidu/test/e2e/OpenViduTestAppE2eTest.java | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java index 066bd528..11e06ea9 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java @@ -63,9 +63,9 @@ public class OpenViduTestE2e { // 2. Any extra flags needed for that codec to work final protected static Map> FFMPEG_VIDEO_CODEC_NAMES = new HashMap<>() { { - put("H264", Pair.of("libx264", "-crf 40")); - put("VP8", Pair.of("libvpx", "-crf 40")); - put("VP9", Pair.of("libvpx-vp9", "-crf 40")); + put("H264", Pair.of("libx264", "")); + put("VP8", Pair.of("libvpx", "")); + put("VP9", Pair.of("libvpx-vp9", "")); put("MPEG-4", Pair.of("mpeg4", "")); put("M-JPEG", Pair.of("mjpeg", "-force_duplicated_matrix:v 1 -huffman:v 0")); // put("AV1", Pair.of("libaom-av1", "")); // NOT SUPPORTED BY THE RTSP SERVER @@ -296,11 +296,11 @@ public class OpenViduTestE2e { private String getFileUrl(boolean withVideo, boolean withAudio) throws Exception { String fileUrl; if (withAudio && withVideo) { - fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_1080p_60fps_normal.mp4"; + fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_640x360_30fps_normal_fastdecode.mkv"; } else if (!withAudio && withVideo) { - fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_1080p_60fps_normal_noaudio.mp4"; + fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_640x360_30fps_normal_noaudio_fastdecode.mkv"; } else if (withAudio) { - fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_1080p_60fps_normal_onlyaudio.mp3"; + fileUrl = "https://s3.eu-west-1.amazonaws.com/public.openvidu.io/bbb_sunflower_1080p_60fps_normal_onlyaudio_fastdecode.flac"; } else { throw new Exception("Must have audio or video"); } diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java index 42cb877a..331a8524 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java @@ -1932,7 +1932,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { @Test @DisplayName("RTSP ingress OPUS") - @Disabled // Ingress fails with error "Could not write to resource" void rtspIngressOPUSTest() throws Exception { log.info("RTSP ingress OPUS"); String rtspUri = startRtspServer(null, "OPUS"); @@ -1941,7 +1940,6 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest { @Test @DisplayName("RTSP ingress G711") - @Disabled // Ingress fails with error "Not found" void rtspIngressG711Test() throws Exception { log.info("RTSP ingress G711"); String rtspUri = startRtspServer(null, "G711");