VP9 テストを独立させ、エンコーダー/デコーダー設定から VP9 を削除する

Author: voluntas

e2e-test/test_sumomo_amd_amf.py

@@ -1,6 +1,8 @@
 """Sumomo の AMD AMF E2E テスト
 
-AMD AMF (Advanced Media Framework) を使用した VP9/AV1/H264/H265 のテスト
+AMD AMF (Advanced Media Framework) を使用した AV1/H264/H265 のテスト
+
+- TODO: VP9 はデコードのみ AMD-AMF が対応しているのでテストは独立させる
 """
 
 import os
@@ -29,7 +31,6 @@
 @pytest.mark.parametrize(
     "video_codec_type",
     [
-        "VP9",
         "AV1",
         "H264",
         "H265",
@@ -46,10 +47,7 @@ def test_sendonly_recvonly(
 
     # エンコーダー設定を準備
     encoder_params = {}
-    if video_codec_type == "VP9":
-        # VP9 は decode だけなので internal を指定
-        encoder_params["vp9_encoder"] = "internal"
-    elif video_codec_type == "AV1":
+    if video_codec_type == "AV1":
         encoder_params["av1_encoder"] = "amd_amf"
     elif video_codec_type == "H264":
         encoder_params["h264_encoder"] = "amd_amf"
@@ -58,9 +56,7 @@ def test_sendonly_recvonly(
 
     # デコーダー設定を準備
     decoder_params = {}
-    if video_codec_type == "VP9":
-        decoder_params["vp9_decoder"] = "amd_amf"
-    elif video_codec_type == "AV1":
+    if video_codec_type == "AV1":
         decoder_params["av1_decoder"] = "amd_amf"
     elif video_codec_type == "H264":
         decoder_params["h264_decoder"] = "amd_amf"
@@ -74,9 +70,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:
@@ -87,8 +83,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)
@@ -102,11 +96,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
@@ -115,12 +104,6 @@ def test_sendonly_recvonly(
             assert "encoderImplementation" in sender_video_outbound
             assert sender_video_outbound["encoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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
@@ -130,11 +113,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
@@ -143,12 +121,6 @@ def test_sendonly_recvonly(
             assert "decoderImplementation" in receiver_video_inbound
             assert receiver_video_inbound["decoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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",
@@ -170,10 +142,7 @@ def test_sendrecv(
 
     # エンコーダー設定を準備
     encoder_params = {}
-    if video_codec_type == "VP9":
-        # VP9 は decode だけなので internal を指定
-        encoder_params["vp9_encoder"] = "internal"
-    elif video_codec_type == "AV1":
+    if video_codec_type == "AV1":
         encoder_params["av1_encoder"] = "amd_amf"
     elif video_codec_type == "H264":
         encoder_params["h264_encoder"] = "amd_amf"
@@ -182,9 +151,7 @@ def test_sendrecv(
 
     # デコーダー設定を準備
     decoder_params = {}
-    if video_codec_type == "VP9":
-        decoder_params["vp9_decoder"] = "amd_amf"
-    elif video_codec_type == "AV1":
+    if video_codec_type == "AV1":
         decoder_params["av1_decoder"] = "amd_amf"
     elif video_codec_type == "H264":
         decoder_params["h264_decoder"] = "amd_amf"
@@ -201,9 +168,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:
@@ -214,9 +181,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:
@@ -231,11 +198,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
@@ -244,12 +206,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client1_video_outbound
             assert client1_video_outbound["encoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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
@@ -258,12 +214,6 @@ def test_sendrecv(
             assert "decoderImplementation" in client1_video_inbound
             assert client1_video_inbound["decoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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
@@ -273,11 +223,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
@@ -286,12 +231,6 @@ def test_sendrecv(
             assert "encoderImplementation" in client2_video_outbound
             assert client2_video_outbound["encoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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
@@ -300,12 +239,6 @@ def test_sendrecv(
             assert "decoderImplementation" in client2_video_inbound
             assert client2_video_inbound["decoderImplementation"] == CODEC_IMPLEMENTATION
 
-            # 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
-
 
 # AMD AMF では VP9 デコードのみ対応
 @pytest.mark.parametrize(
@@ -333,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,
@@ -362,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 = [
@@ -385,18 +307,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