sora-sdk 2025.1.0.dev14__tar.gz → 2025.1.0.dev15__tar.gz

{sora_sdk-2025.1.0.dev14/src/sora_sdk.egg-info → sora_sdk-2025.1.0.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sora_sdk
-Version: 2025.1.0.dev14
+Version: 2025.1.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-2025.1.0.dev14 → sora_sdk-2025.1.0.dev15}/pyproject.toml

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

{sora_sdk-2025.1.0.dev14 → sora_sdk-2025.1.0.dev15}/src/sora_sdk/sora_sdk_ext.pyi

@@ -488,3 +488,5 @@ def create_video_codec_preference_from_implementation(arg0: SoraVideoCodecCapabi
 def enable_libwebrtc_log(arg: SoraLoggingSeverity, /) -> None: ...
 
 def get_video_codec_capability(openh264: str | None = None) -> SoraVideoCodecCapability: ...
+
+def rtc_log(arg0: SoraLoggingSeverity, arg1: str, /) -> None: ...

{sora_sdk-2025.1.0.dev14 → sora_sdk-2025.1.0.dev15/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sora_sdk
-Version: 2025.1.0.dev14
+Version: 2025.1.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-2025.1.0.dev14 → sora_sdk-2025.1.0.dev15}/src/sora_sdk.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ tests/test_authz.py
 tests/test_authz_simulcast.py
 tests/test_ca_cert.py
 tests/test_capability.py
-tests/test_codec_preference.py
 tests/test_degradation_preference.py
 tests/test_encoded_transform.py
 tests/test_intel_vpl.py

{sora_sdk-2025.1.0.dev14 → sora_sdk-2025.1.0.dev15}/tests/test_openh264.py

@@ -6,12 +6,85 @@ import pytest
 from client import SoraClient, SoraRole
 
 from sora_sdk import (
+    Sora,
     SoraVideoCodecImplementation,
     SoraVideoCodecPreference,
     SoraVideoCodecType,
+    get_video_codec_capability,
 )
 
 
+def test_openh264_get_codec_capability(setup):
+    openh264_path = setup.get("openh264_path")
+    capability = get_video_codec_capability(openh264_path)
+
+    cisco_openh264_available = False
+
+    for e in capability.engines:
+        if e.name == SoraVideoCodecImplementation.CISCO_OPENH264:
+            cisco_openh264_available = True
+    assert cisco_openh264_available is True
+
+    codecs = []
+    for e in capability.engines:
+        # macOS では INTERNAL の Video Toolbox が利用されるので OpenH264 は採用しないようにする
+        if sys.platform == "darwin":
+            if e.name == SoraVideoCodecImplementation.CISCO_OPENH264:
+                continue
+
+        for c in e.codecs:
+            if c.decoder or c.encoder:
+                # encoder/decoder どちらかが true であれば採用する
+                if c.decoder or c.encoder:
+                    codecs.append(
+                        SoraVideoCodecPreference.Codec(
+                            type=c.type,
+                            decoder=e.name,
+                            encoder=e.name,
+                        )
+                    )
+
+    # エラーにならないことを確認する
+    Sora(
+        video_codec_preference=SoraVideoCodecPreference(
+            codecs=codecs,
+        ),
+        openh264=openh264_path,
+    )
+
+
+def test_openh264_video_codec_preference(setup):
+    openh264_path = setup.get("openh264_path")
+    Sora(
+        video_codec_preference=SoraVideoCodecPreference(
+            codecs=[
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.VP8,
+                    decoder=SoraVideoCodecImplementation.INTERNAL,
+                    encoder=SoraVideoCodecImplementation.INTERNAL,
+                ),
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.VP9,
+                    decoder=SoraVideoCodecImplementation.INTERNAL,
+                    encoder=SoraVideoCodecImplementation.INTERNAL,
+                ),
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.AV1,
+                    decoder=SoraVideoCodecImplementation.INTERNAL,
+                    encoder=SoraVideoCodecImplementation.INTERNAL,
+                ),
+                # H.264 だけは OpenH264 を利用するようにする
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.H264,
+                    decoder=SoraVideoCodecImplementation.CISCO_OPENH264,
+                    encoder=SoraVideoCodecImplementation.CISCO_OPENH264,
+                ),
+            ],
+        ),
+        openh264=openh264_path,
+    )
+
+
 def test_openh264_sendonly_recvonly(setup):
     signaling_urls = setup.get("signaling_urls")
     channel_id_prefix = setup.get("channel_id_prefix")

sora_sdk-2025.1.0.dev14/tests/test_codec_preference.py

@@ -1,124 +0,0 @@
-import sys
-
-from sora_sdk import (
-    Sora,
-    SoraVideoCodecImplementation,
-    SoraVideoCodecPreference,
-    SoraVideoCodecType,
-    get_video_codec_capability,
-)
-
-
-# このテストでは Linux では NVIDIA Video Codec SDK > Intel VPL > OpenH264 の順で優先される
-# このテストでは Windows では NVIDIA Video Codec SDK > Intel VPL の順で優先される
-# このテストでは macOS では Video Toolbox >OpenH264 の順で優先される
-def test_get_codec_capability(setup):
-    openh264_path = setup.get("openh264_path")
-    capability = get_video_codec_capability(openh264_path)
-
-    intel_vpl_available = False
-    cisco_openh264_available = False
-    nvidia_video_codec_sdk_available = False
-
-    for e in capability.engines:
-        if e.name == SoraVideoCodecImplementation.INTEL_VPL:
-            intel_vpl_available = True
-        if e.name == SoraVideoCodecImplementation.CISCO_OPENH264:
-            cisco_openh264_available = True
-        if e.name == SoraVideoCodecImplementation.NVIDIA_VIDEO_CODEC_SDK:
-            nvidia_video_codec_sdk_available = True
-
-    match sys.platform:
-        case "linux":
-            assert openh264_path is not None
-            assert cisco_openh264_available is True
-        case "darwin":
-            assert openh264_path is not None
-            assert cisco_openh264_available is True
-        case "win32":
-            # SDK 的には Windows は非対応だが GitHub Actions の E2E テストの OpenH264 のパスは指定してある
-            assert openh264_path is not None
-            assert cisco_openh264_available is True
-
-    codecs = []
-    for e in capability.engines:
-        if sys.platform == "linux":
-            # Intel VPL があったら Open H.264 は採用しない
-            if intel_vpl_available and e.name == SoraVideoCodecImplementation.CISCO_OPENH264:
-                continue
-
-            # NVIDIA Video Codec SDK があったら Intel VPL は採用しない
-            if (
-                nvidia_video_codec_sdk_available
-                and e.name == SoraVideoCodecImplementation.INTEL_VPL
-            ):
-                continue
-
-            # NVIDIA Video Codec SDK があったら OpenH264 は採用しない
-            if (
-                nvidia_video_codec_sdk_available
-                and e.name == SoraVideoCodecImplementation.CISCO_OPENH264
-            ):
-                continue
-
-        # macOS では INTERNAL の Video Toolbox が利用されるので OpenH264 は採用しないようにする
-        if sys.platform == "darwin":
-            if e.name == SoraVideoCodecImplementation.CISCO_OPENH264:
-                continue
-
-        for c in e.codecs:
-            if c.decoder or c.encoder:
-                # encoder/decoder どちらかが true であれば採用する
-                if c.decoder or c.encoder:
-                    codecs.append(
-                        SoraVideoCodecPreference.Codec(
-                            type=c.type,
-                            decoder=e.name,
-                            encoder=e.name,
-                        )
-                    )
-
-        # print(e.parameters.nvcodec_gpu_device_name)
-        # print(e.parameters.openh264_path)
-        # print(e.parameters.version)
-        # print(e.parameters.vpl_impl)
-        # print(e.parameters.vpl_impl_value)
-
-    Sora(
-        video_codec_preference=SoraVideoCodecPreference(
-            codecs=codecs,
-        ),
-        openh264=openh264_path,
-    )
-
-
-def test_video_codec_preference(setup):
-    openh264_path = setup.get("openh264_path")
-    Sora(
-        video_codec_preference=SoraVideoCodecPreference(
-            codecs=[
-                SoraVideoCodecPreference.Codec(
-                    type=SoraVideoCodecType.VP8,
-                    decoder=SoraVideoCodecImplementation.INTERNAL,
-                    encoder=SoraVideoCodecImplementation.INTERNAL,
-                ),
-                SoraVideoCodecPreference.Codec(
-                    type=SoraVideoCodecType.VP9,
-                    decoder=SoraVideoCodecImplementation.INTERNAL,
-                    encoder=SoraVideoCodecImplementation.INTERNAL,
-                ),
-                SoraVideoCodecPreference.Codec(
-                    type=SoraVideoCodecType.AV1,
-                    decoder=SoraVideoCodecImplementation.INTERNAL,
-                    encoder=SoraVideoCodecImplementation.INTERNAL,
-                ),
-                # H.264 だけは OpenH264 を利用するようにする
-                SoraVideoCodecPreference.Codec(
-                    type=SoraVideoCodecType.H264,
-                    decoder=SoraVideoCodecImplementation.CISCO_OPENH264,
-                    encoder=SoraVideoCodecImplementation.CISCO_OPENH264,
-                ),
-            ],
-        ),
-        openh264=openh264_path,
-    )