sora-sdk 2024.4.0.dev13__tar.gz → 2024.4.0.dev15__tar.gz

{sora_sdk-2024.4.0.dev13/src/sora_sdk.egg-info → sora_sdk-2024.4.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev13
+Version: 2024.4.0.dev15
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

{sora_sdk-2024.4.0.dev13 → sora_sdk-2024.4.0.dev15}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2024.4.0.dev13"
+version = "2024.4.0.dev15"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }

{sora_sdk-2024.4.0.dev13 → sora_sdk-2024.4.0.dev15/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev13
+Version: 2024.4.0.dev15
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>

{sora_sdk-2024.4.0.dev13 → sora_sdk-2024.4.0.dev15}/tests/test_macos.py

@@ -58,6 +58,68 @@ def test_macos_video_hwa_sendonly(setup, video_codec_type):
     assert outbound_rtp_stats["packetsSent"] > 0
 
 
+@pytest.mark.skipif(sys.platform != "darwin", reason="macOS でのみ実行する")
+@pytest.mark.parametrize(
+    ("video_codec_type", "expected_implementation"),
+    [
+        ("H264", "SimulcastEncoderAdapter (VideoToolbox, VideoToolbox, VideoToolbox)"),
+        ("H265", "SimulcastEncoderAdapter (VideoToolbox, VideoToolbox, VideoToolbox)"),
+    ],
+)
+def test_macos_simulcast(setup, video_codec_type, expected_implementation):
+    signaling_urls = setup.get("signaling_urls")
+    channel_id_prefix = setup.get("channel_id_prefix")
+    metadata = setup.get("metadata")
+
+    channel_id = f"{channel_id_prefix}_{__name__}_{sys._getframe().f_code.co_name}_{uuid.uuid4()}"
+
+    sendonly = SoraClient(
+        signaling_urls,
+        SoraRole.SENDONLY,
+        channel_id,
+        simulcast=True,
+        audio=False,
+        video=True,
+        video_codec_type=video_codec_type,
+        video_bit_rate=3000,
+        metadata=metadata,
+        video_width=1280,
+        video_height=720,
+        use_hwa=True,
+    )
+    sendonly.connect(fake_video=True)
+
+    time.sleep(5)
+
+    sendonly_stats = sendonly.get_stats()
+
+    sendonly.disconnect()
+
+    # "type": "answer" の SDP で Simulcast があるかどうか
+    assert sendonly.answer_message is not None
+    assert "sdp" in sendonly.answer_message
+    assert "a=simulcast:send r0;r1;r2" in sendonly.answer_message["sdp"]
+
+    # codec が無かったら StopIteration 例外が上がる
+    sendonly_codec_stats = next(s for s in sendonly_stats if s.get("type") == "codec")
+    assert sendonly_codec_stats["mimeType"] == f"video/{video_codec_type}"
+
+    # 複数のoutbound-rtp統計情報を取得
+    outbound_rtp_stats = [
+        s for s in sendonly_stats if s.get("type") == "outbound-rtp" and s.get("kind") == "video"
+    ]
+    assert len(outbound_rtp_stats) == 3
+
+    # rid でソート
+    sorted_stats = sorted(outbound_rtp_stats, key=lambda x: x.get("rid", ""))
+
+    for i, rtp_stat in enumerate(sorted_stats):
+        assert rtp_stat["rid"] == f"r{i}"
+        assert rtp_stat["encoderImplementation"] == expected_implementation
+        assert rtp_stat["bytesSent"] > 0
+        assert rtp_stat["packetsSent"] > 0
+
+
 @pytest.mark.skip(reason="ローカルでは成功する")
 def test_macos_h264_sendonly_recvonly(setup):
     signaling_urls = setup.get("signaling_urls")

{sora_sdk-2024.4.0.dev13 → sora_sdk-2024.4.0.dev15}/tests/test_simulcast.py

@@ -65,3 +65,4 @@ def test_simulcast(setup, video_codec_type, expected_implementation):
         assert rtp_stat["encoderImplementation"] == expected_implementation
         assert rtp_stat["bytesSent"] > 0
         assert rtp_stat["packetsSent"] > 0
+