HWA では audio はテストしない

Author: voluntas

e2e-test/test_sumomo_intel_vpl.py

@@ -195,9 +195,9 @@ def test_sendrecv(
         role="sendrecv",
         metadata=sora_settings.metadata,
         http_port=next(port_allocator),
+        audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        audio=True,
         initial_wait=10,
         **codec_params,
     ) as client1:
@@ -208,9 +208,9 @@ def test_sendrecv(
             role="sendrecv",
             metadata=sora_settings.metadata,
             http_port=next(port_allocator),
+            audio=False,
             video=True,
             video_codec_type=video_codec_type,
-            audio=True,
             initial_wait=10,
             **codec_params,
         ) as client2:
@@ -225,11 +225,6 @@ def test_sendrecv(
             assert client1_video_codec is not None
             assert client1_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            client1_audio_codec = get_codec(client1_stats, "audio/opus")
-            assert client1_audio_codec is not None
-            assert client1_audio_codec["mimeType"] == "audio/opus"
-
             # video outbound-rtp を確認
             client1_video_outbound = get_outbound_rtp(client1_stats, "video")
             assert client1_video_outbound is not None
@@ -238,12 +233,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client1_video_outbound
             assert client1_video_outbound["encoderImplementation"] == "libvpl"
 
-            # audio outbound-rtp を確認
-            client1_audio_outbound = get_outbound_rtp(client1_stats, "audio")
-            assert client1_audio_outbound is not None
-            assert client1_audio_outbound["packetsSent"] > 0
-            assert client1_audio_outbound["bytesSent"] > 0
-
             # video inbound-rtp を確認
             client1_video_inbound = get_inbound_rtp(client1_stats, "video")
             assert client1_video_inbound is not None
@@ -252,12 +241,6 @@ def test_sendrecv(
             assert "decoderImplementation" in client1_video_inbound
             assert client1_video_inbound["decoderImplementation"] == "libvpl"
 
-            # audio inbound-rtp を確認
-            client1_audio_inbound = get_inbound_rtp(client1_stats, "audio")
-            assert client1_audio_inbound is not None
-            assert client1_audio_inbound["packetsReceived"] > 0
-            assert client1_audio_inbound["bytesReceived"] > 0
-
             # クライアント 2 の統計を確認
             client2_stats = client2.get_stats()
             assert client2_stats is not None
@@ -267,11 +250,6 @@ def test_sendrecv(
             assert client2_video_codec is not None
             assert client2_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            client2_audio_codec = get_codec(client2_stats, "audio/opus")
-            assert client2_audio_codec is not None
-            assert client2_audio_codec["mimeType"] == "audio/opus"
-
             # video outbound-rtp を確認
             client2_video_outbound = get_outbound_rtp(client2_stats, "video")
             assert client2_video_outbound is not None
@@ -280,12 +258,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client2_video_outbound
             assert client2_video_outbound["encoderImplementation"] == "libvpl"
 
-            # audio outbound-rtp を確認
-            client2_audio_outbound = get_outbound_rtp(client2_stats, "audio")
-            assert client2_audio_outbound is not None
-            assert client2_audio_outbound["packetsSent"] > 0
-            assert client2_audio_outbound["bytesSent"] > 0
-
             # video inbound-rtp を確認
             client2_video_inbound = get_inbound_rtp(client2_stats, "video")
             assert client2_video_inbound is not None
@@ -294,12 +266,6 @@ def test_sendrecv(
             assert "decoderImplementation" in client2_video_inbound
             assert client2_video_inbound["decoderImplementation"] == "libvpl"
 
-            # audio inbound-rtp を確認
-            client2_audio_inbound = get_inbound_rtp(client2_stats, "audio")
-            assert client2_audio_inbound is not None
-            assert client2_audio_inbound["packetsReceived"] > 0
-            assert client2_audio_inbound["bytesReceived"] > 0
-
 
 @pytest.mark.parametrize(
     "video_codec_type",
@@ -329,7 +295,7 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         role="sendonly",
         metadata=sora_settings.metadata,
         http_port=free_port,
-        audio=True,
+        audio=False,
         video=True,
         video_codec_type=video_codec_type,
         simulcast=True,
@@ -358,17 +324,6 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         for expected_type in expected_types:
             assert expected_type in stat_types
 
-        # audio codec を確認
-        audio_codec_stats = [
-            stat
-            for stat in stats
-            if stat.get("type") == "codec" and stat.get("mimeType") == "audio/opus"
-        ]
-        assert len(audio_codec_stats) == 1
-
-        audio_codec = audio_codec_stats[0]
-        assert audio_codec["clockRate"] == 48000
-
         # video codec を確認
         expected_mime_type = f"video/{video_codec_type}"
         video_codec_stats = [
@@ -381,18 +336,6 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         video_codec = video_codec_stats[0]
         assert video_codec["clockRate"] == 90000
 
-        # audio の outbound-rtp を確認
-        audio_outbound_rtp_stats = [
-            stat
-            for stat in stats
-            if stat.get("type") == "outbound-rtp" and stat.get("kind") == "audio"
-        ]
-        assert len(audio_outbound_rtp_stats) == 1
-
-        audio_outbound_rtp = audio_outbound_rtp_stats[0]
-        assert audio_outbound_rtp["packetsSent"] > 0
-        assert audio_outbound_rtp["bytesSent"] > 0
-
         # simulcast では video の outbound-rtp が 3 つ存在することを確認
         video_outbound_rtp_by_rid = get_simulcast_outbound_rtp(stats, "video")
         assert len(video_outbound_rtp_by_rid) == 3

e2e-test/test_sumomo_nvidia_video_codec.py

@@ -8,10 +8,15 @@
 
 import pytest
 
-from helper import get_codec, get_inbound_rtp, get_outbound_rtp, get_simulcast_outbound_rtp, get_transport
+from helper import (
+    get_codec,
+    get_inbound_rtp,
+    get_outbound_rtp,
+    get_simulcast_outbound_rtp,
+    get_transport,
+)
 from sumomo import Sumomo
 
-
 # NVIDIA Video Codec 環境が有効でない場合はスキップ
 pytestmark = pytest.mark.skipif(
     not os.environ.get("NVIDIA_VIDEO_CODEC"),
@@ -61,9 +66,9 @@ def test_sendonly_recvonly(
         role="sendonly",
         metadata=sora_settings.metadata,
         http_port=next(port_allocator),
+        audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        audio=True,
         initial_wait=10,
         **encoder_params,
     ) as sender:
@@ -74,8 +79,6 @@ def test_sendonly_recvonly(
             role="recvonly",
             metadata=sora_settings.metadata,
             http_port=next(port_allocator),
-            video=True,
-            audio=True,
             **decoder_params,
         ) as receiver:
             time.sleep(3)
@@ -89,11 +92,6 @@ def test_sendonly_recvonly(
             assert sender_video_codec is not None
             assert sender_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            sender_audio_codec = get_codec(sender_stats, "audio/opus")
-            assert sender_audio_codec is not None
-            assert sender_audio_codec["mimeType"] == "audio/opus"
-
             # video outbound-rtp を確認
             sender_video_outbound = get_outbound_rtp(sender_stats, "video")
             assert sender_video_outbound is not None
@@ -102,12 +100,6 @@ def test_sendonly_recvonly(
             assert "encoderImplementation" in sender_video_outbound
             assert sender_video_outbound["encoderImplementation"] == "NvCodec"
 
-            # audio outbound-rtp を確認
-            sender_audio_outbound = get_outbound_rtp(sender_stats, "audio")
-            assert sender_audio_outbound is not None
-            assert sender_audio_outbound["packetsSent"] > 0
-            assert sender_audio_outbound["bytesSent"] > 0
-
             # 受信側の統計を確認
             receiver_stats = receiver.get_stats()
             assert receiver_stats is not None
@@ -117,11 +109,6 @@ def test_sendonly_recvonly(
             assert receiver_video_codec is not None
             assert receiver_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            receiver_audio_codec = get_codec(receiver_stats, "audio/opus")
-            assert receiver_audio_codec is not None
-            assert receiver_audio_codec["mimeType"] == "audio/opus"
-
             # video inbound-rtp を確認
             receiver_video_inbound = get_inbound_rtp(receiver_stats, "video")
             assert receiver_video_inbound is not None
@@ -130,12 +117,6 @@ def test_sendonly_recvonly(
             assert "decoderImplementation" in receiver_video_inbound
             assert receiver_video_inbound["decoderImplementation"] == "NvCodec"
 
-            # audio inbound-rtp を確認
-            receiver_audio_inbound = get_inbound_rtp(receiver_stats, "audio")
-            assert receiver_audio_inbound is not None
-            assert receiver_audio_inbound["packetsReceived"] > 0
-            assert receiver_audio_inbound["bytesReceived"] > 0
-
 
 @pytest.mark.parametrize(
     "video_codec_type",
@@ -182,9 +163,9 @@ def test_sendrecv(
         role="sendrecv",
         metadata=sora_settings.metadata,
         http_port=next(port_allocator),
+        audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        audio=True,
         initial_wait=10,
         **codec_params,
     ) as client1:
@@ -195,9 +176,9 @@ def test_sendrecv(
             role="sendrecv",
             metadata=sora_settings.metadata,
             http_port=next(port_allocator),
+            audio=False,
             video=True,
             video_codec_type=video_codec_type,
-            audio=True,
             initial_wait=10,
             **codec_params,
         ) as client2:
@@ -212,11 +193,6 @@ def test_sendrecv(
             assert client1_video_codec is not None
             assert client1_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            client1_audio_codec = get_codec(client1_stats, "audio/opus")
-            assert client1_audio_codec is not None
-            assert client1_audio_codec["mimeType"] == "audio/opus"
-
             # video outbound-rtp を確認
             client1_video_outbound = get_outbound_rtp(client1_stats, "video")
             assert client1_video_outbound is not None
@@ -225,12 +201,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client1_video_outbound
             assert client1_video_outbound["encoderImplementation"] == "NvCodec"
 
-            # audio outbound-rtp を確認
-            client1_audio_outbound = get_outbound_rtp(client1_stats, "audio")
-            assert client1_audio_outbound is not None
-            assert client1_audio_outbound["packetsSent"] > 0
-            assert client1_audio_outbound["bytesSent"] > 0
-
             # video inbound-rtp を確認
             client1_video_inbound = get_inbound_rtp(client1_stats, "video")
             assert client1_video_inbound is not None
@@ -239,12 +209,6 @@ def test_sendrecv(
             assert "decoderImplementation" in client1_video_inbound
             assert client1_video_inbound["decoderImplementation"] == "NvCodec"
 
-            # audio inbound-rtp を確認
-            client1_audio_inbound = get_inbound_rtp(client1_stats, "audio")
-            assert client1_audio_inbound is not None
-            assert client1_audio_inbound["packetsReceived"] > 0
-            assert client1_audio_inbound["bytesReceived"] > 0
-
             # クライアント 2 の統計を確認
             client2_stats = client2.get_stats()
             assert client2_stats is not None
@@ -254,11 +218,6 @@ def test_sendrecv(
             assert client2_video_codec is not None
             assert client2_video_codec["mimeType"] == expected_mime_type
 
-            # audio codec を確認
-            client2_audio_codec = get_codec(client2_stats, "audio/opus")
-            assert client2_audio_codec is not None
-            assert client2_audio_codec["mimeType"] == "audio/opus"
-
             # video outbound-rtp を確認
             client2_video_outbound = get_outbound_rtp(client2_stats, "video")
             assert client2_video_outbound is not None
@@ -267,12 +226,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client2_video_outbound
             assert client2_video_outbound["encoderImplementation"] == "NvCodec"
 
-            # audio outbound-rtp を確認
-            client2_audio_outbound = get_outbound_rtp(client2_stats, "audio")
-            assert client2_audio_outbound is not None
-            assert client2_audio_outbound["packetsSent"] > 0
-            assert client2_audio_outbound["bytesSent"] > 0
-
             # video inbound-rtp を確認
             client2_video_inbound = get_inbound_rtp(client2_stats, "video")
             assert client2_video_inbound is not None
@@ -313,7 +266,7 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         role="sendonly",
         metadata=sora_settings.metadata,
         http_port=free_port,
-        audio=True,
+        audio=False,
         video=True,
         video_codec_type=video_codec_type,
         simulcast=True,
@@ -342,17 +295,6 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         for expected_type in expected_types:
             assert expected_type in stat_types
 
-        # audio codec を確認
-        audio_codec_stats = [
-            stat
-            for stat in stats
-            if stat.get("type") == "codec" and stat.get("mimeType") == "audio/opus"
-        ]
-        assert len(audio_codec_stats) == 1
-
-        audio_codec = audio_codec_stats[0]
-        assert audio_codec["clockRate"] == 48000
-
         # video codec を確認
         expected_mime_type = f"video/{video_codec_type}"
         video_codec_stats = [
@@ -373,10 +315,6 @@ def test_simulcast(sora_settings, free_port, video_codec_type):
         ]
         assert len(audio_outbound_rtp_stats) == 1
 
-        audio_outbound_rtp = audio_outbound_rtp_stats[0]
-        assert audio_outbound_rtp["packetsSent"] > 0
-        assert audio_outbound_rtp["bytesSent"] > 0
-
         # simulcast では video の outbound-rtp が 3 つ存在することを確認
         video_outbound_rtp_by_rid = get_simulcast_outbound_rtp(stats, "video")
         assert len(video_outbound_rtp_by_rid) == 3