transport-wide-cc-extensions-01 の出力に合わせてテストを変更する

CHANGES.md

@@ -99,6 +99,14 @@
   - @voluntas
 - [ADD] examples に E2E テストを追加する
   - @voluntas
+- [FIX] トランスポートワイド輻輳制御を有効時の出力に合わせてサイマルキャストの E2E テストを変更する
+  - Sora のトランスポートワイド輻輳制御を有効にしたことで、サイマルキャストの WebRTC Stats の outbound-rtp -> encoderImplementation の出力内容が変わったため、テストの期待結果を修正する
+  - Sora のトランスポートワイド輻輳制御は有効であることを前提とした修正
+  - サイマルキャストの encoderImplementation の結果を以下の通り
+    - "SimulcastEncoderAdapter (libaom, libaom, libaom)" -> "SimulcastEncoderAdapter (libaom)"
+    - "SimulcastEncoderAdapter (libvpx, libvpx, libvpx)" -> "SimulcastEncoderAdapter (libvpx)"
+    - "SimulcastEncoderAdapter (OpenH264, OpenH264, OpenH264)" -> "SimulcastEncoderAdapter (OpenH264)"
+    - "SimulcastEncoderAdapter (VideoToolbox, VideoToolbox, VideoToolbox)" -> "SimulcastEncoderAdapter (VideoToolbox)"
 
 ## 2024.3.0
 

tests/test_macos.py

@@ -62,8 +62,8 @@ def test_macos_video_hwa_sendonly(setup, video_codec_type):
 @pytest.mark.parametrize(
     ("video_codec_type", "expected_implementation"),
     [
-        ("H264", "SimulcastEncoderAdapter (VideoToolbox, VideoToolbox, VideoToolbox)"),
-        ("H265", "SimulcastEncoderAdapter (VideoToolbox, VideoToolbox, VideoToolbox)"),
+        ("H264", "VideoToolbox"),
+        ("H265", "VideoToolbox"),
     ],
 )
 def test_macos_simulcast(setup, video_codec_type, expected_implementation):
@@ -89,7 +89,7 @@ def test_macos_simulcast(setup, video_codec_type, expected_implementation):
     )
     sendonly.connect(fake_video=True)
 
-    time.sleep(5)
+    time.sleep(10)
 
     sendonly_stats = sendonly.get_stats()
 
@@ -115,7 +115,8 @@ def test_macos_simulcast(setup, video_codec_type, expected_implementation):
 
     for i, rtp_stat in enumerate(sorted_stats):
         assert rtp_stat["rid"] == f"r{i}"
-        assert rtp_stat["encoderImplementation"] == expected_implementation
+        assert "SimulcastEncoderAdapter" in rtp_stat["encoderImplementation"]
+        assert expected_implementation in rtp_stat["encoderImplementation"]
         assert rtp_stat["bytesSent"] > 0
         assert rtp_stat["packetsSent"] > 0
 

tests/test_openh264.py

@@ -72,7 +72,7 @@ def test_openh264_sendonly_recvonly(setup):
 @pytest.mark.parametrize(
     "video_codec_type,expected_implementation",
     [
-        ("H264", "SimulcastEncoderAdapter (OpenH264, OpenH264, OpenH264)"),
+        ("H264", "OpenH264"),
     ],
 )
 def test_openh264_simulcast(setup, video_codec_type, expected_implementation):
@@ -101,7 +101,7 @@ def test_openh264_simulcast(setup, video_codec_type, expected_implementation):
     )
     sendonly.connect(fake_video=True)
 
-    time.sleep(5)
+    time.sleep(10)
 
     sendonly_stats = sendonly.get_stats()
 
@@ -122,6 +122,7 @@ def test_openh264_simulcast(setup, video_codec_type, expected_implementation):
 
     for i, rtp_stat in enumerate(sorted_stats):
         assert rtp_stat["rid"] == f"r{i}"
-        assert rtp_stat["encoderImplementation"] == expected_implementation
+        assert "SimulcastEncoderAdapter" in rtp_stat["encoderImplementation"]
+        assert expected_implementation in rtp_stat["encoderImplementation"]
         assert rtp_stat["bytesSent"] > 0
         assert rtp_stat["packetsSent"] > 0

tests/test_simulcast.py

@@ -9,9 +9,9 @@
 @pytest.mark.parametrize(
     ("video_codec_type", "expected_implementation"),
     [
-        ("VP8", "SimulcastEncoderAdapter (libvpx, libvpx, libvpx)"),
-        ("VP9", "SimulcastEncoderAdapter (libvpx, libvpx, libvpx)"),
-        ("AV1", "SimulcastEncoderAdapter (libaom, libaom, libaom)"),
+        ("VP8", "libvpx"),
+        ("VP9", "libvpx"),
+        ("AV1", "libaom"),
     ],
 )
 def test_simulcast(setup, video_codec_type, expected_implementation):
@@ -62,7 +62,7 @@ def test_simulcast(setup, video_codec_type, expected_implementation):
 
     for i, rtp_stat in enumerate(sorted_stats):
         assert rtp_stat["rid"] == f"r{i}"
-        assert rtp_stat["encoderImplementation"] == expected_implementation
+        assert "SimulcastEncoderAdapter" in rtp_stat["encoderImplementation"]
+        assert expected_implementation in rtp_stat["encoderImplementation"]
         assert rtp_stat["bytesSent"] > 0
         assert rtp_stat["packetsSent"] > 0
-