From d4006421e9be7a92a0a93a9c84c19372f74a54f0 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 6 Feb 2025 20:27:32 +0100
Subject: [PATCH] openvidu-test-e2e: add AAC audio codec RTSP tests

---
 .../io/openvidu/test/e2e/OpenViduTestE2e.java |  5 ++-
 .../test/e2e/OpenViduTestAppE2eTest.java      | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 3 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 f77b6dc3..b4783884 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
@@ -82,7 +82,7 @@ public class OpenViduTestE2e {
 	// 3. The string expected to appear on the server log when the stream starts
 	final protected static Map<String, Triple<String, String, String>> FFMPEG_AUDIO_CODEC_NAMES = new HashMap<>() {
 		{
-			put("AAC", Triple.of("aac", "-b:a 128k", "MPEG-4 Audio"));
+			put("AAC", Triple.of("aac", "-ac 2 -b:a 128k", "MPEG-4 Audio"));
 			put("AC3", Triple.of("ac3", "-b:a 128k", null));
 			put("OPUS", Triple.of("libopus", "", "Opus"));
 			put("MP3", Triple.of("libmp3lame", "", "MPEG-1/2 Audio"));
@@ -185,8 +185,7 @@ public class OpenViduTestE2e {
 
 		GenericContainer<?> rtspServerContainer = new GenericContainer<>(DockerImageName.parse(RTSP_SERVER_IMAGE))
 				.withCreateContainerCmdModifier(cmd -> cmd.withName("rtsp-" + Math.random() * 100000))
-				.withEnv(Map.of("MTX_LOGLEVEL",
-						"info", "MTX_PROTOCOLS", "tcp", "MTX_RTSPADDRESS", ":8554", "MTX_HLS",
+				.withEnv(Map.of("MTX_LOGLEVEL", "info", "MTX_PROTOCOLS", "tcp", "MTX_RTSPADDRESS", ":8554", "MTX_HLS",
 						"no", "MTX_RTSP", "yes", "MTX_WEBRTC", "yes", "MTX_SRT", "no", "MTX_RTMP", "no", "MTX_API",
 						"no"))
 				.withExposedPorts(8889, 8554).waitingFor(Wait.forHttp("/").forPort(8889).forStatusCode(404));
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 ab458331..78896db9 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
@@ -1770,6 +1770,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
 		urPullCommon("RTSP", rtspUri, true, true);
 	}
 
+	@Test
+	@DisplayName("RTSP ingress VP8 + AAC")
+	void rtspIngressVP8_AACTest() throws Exception {
+		log.info("RTSP ingress VP8 + AAC");
+		String rtspUri = startRtspServer("VP8", "AAC");
+		urPullCommon("RTSP", rtspUri, true, true);
+	}
+
 	@Test
 	@DisplayName("RTSP ingress MPEG4 + OPUS")
 	void rtspIngressMPEG4_OPUSTest() throws Exception {
@@ -1794,6 +1802,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
 		urPullCommon("RTSP", rtspUri, true, true);
 	}
 
+	@Test
+	@DisplayName("RTSP ingress MPEG-4 + AAC")
+	void rtspIngressMPEG4_AACTest() throws Exception {
+		log.info("RTSP ingress MPEG-4 + AAC");
+		String rtspUri = startRtspServer("MPEG-4", "AAC");
+		urPullCommon("RTSP", rtspUri, true, true);
+	}
+
 	@Test
 	@DisplayName("RTSP ingress VP9 + OPUS")
 	void rtspIngressVP9_OPUSTest() throws Exception {
@@ -1818,6 +1834,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
 		urPullCommon("RTSP", rtspUri, true, true);
 	}
 
+	@Test
+	@DisplayName("RTSP ingress VP9 + AAC")
+	void rtspIngressVP9_AACTest() throws Exception {
+		log.info("RTSP ingress VP9 + AAC");
+		String rtspUri = startRtspServer("VP9", "AAC");
+		urPullCommon("RTSP", rtspUri, true, true);
+	}
+
 	@Test
 	@DisplayName("RTSP ingress M-JPEG + OPUS")
 	void rtspIngressMJPEG_OPUSTest() throws Exception {
@@ -1842,6 +1866,14 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestappE2eTest {
 		urPullCommon("RTSP", rtspUri, true, true);
 	}
 
+	@Test
+	@DisplayName("RTSP ingress M-JPEG + AAC")
+	void rtspIngressMJPEG_AACTest() throws Exception {
+		log.info("RTSP ingress M-JPEG + AAC");
+		String rtspUri = startRtspServer("M-JPEG", "AAC");
+		urPullCommon("RTSP", rtspUri, true, true);
+	}
+
 	@Test
 	@DisplayName("RTSP ingress H264")
 	void rtspIngressH264Test() throws Exception {