sora-sdk 2025.1.0.dev4__tar.gz → 2025.1.0.dev6__tar.gz

{sora_sdk-2025.1.0.dev4/src/sora_sdk.egg-info → sora_sdk-2025.1.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sora_sdk
-Version: 2025.1.0.dev4
+Version: 2025.1.0.dev6
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -290,15 +290,15 @@ PyPI 経由ではインストールできません。
 
 ## 対応プラットフォーム
 
-- Windows 11 x86_64
-- Windows Server 2022 x86_64
-- macOS Sequoia 15 arm64
-- macOS Ventura 14 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
 - Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
   - PyPI からではなくパッケージファイルを利用してください
+- macOS Sequoia 15 arm64
+- macOS Ventura 14 arm64
+- Windows 11 x86_64
+- Windows Server 2022 x86_64
 
 ### macOS の対応バージョン
 
@@ -323,6 +323,7 @@ PyPI 経由ではインストールできません。
 
 - Windows 11 arm64
 - Ubuntu 22.04 arm64
+- Ubuntu 22.04 arm64 (NVIDIA Jetson JetPack SDK 6.1)
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)
 - AMD Video Core Next (VCN) 対応
   - VP9 / AV1 / H.264 / H.265

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/README.md

@@ -91,15 +91,15 @@ PyPI 経由ではインストールできません。
 
 ## 対応プラットフォーム
 
-- Windows 11 x86_64
-- Windows Server 2022 x86_64
-- macOS Sequoia 15 arm64
-- macOS Ventura 14 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
 - Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
   - PyPI からではなくパッケージファイルを利用してください
+- macOS Sequoia 15 arm64
+- macOS Ventura 14 arm64
+- Windows 11 x86_64
+- Windows Server 2022 x86_64
 
 ### macOS の対応バージョン
 
@@ -124,6 +124,7 @@ PyPI 経由ではインストールできません。
 
 - Windows 11 arm64
 - Ubuntu 22.04 arm64
+- Ubuntu 22.04 arm64 (NVIDIA Jetson JetPack SDK 6.1)
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)
 - AMD Video Core Next (VCN) 対応
   - VP9 / AV1 / H.264 / H.265

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/buildbase.py

@@ -520,6 +520,7 @@ class WebrtcInfo(NamedTuple):
     webrtc_library_dir: str
     clang_dir: str
     libcxx_dir: str
+    libcxxabi_dir: str
 
 
 def get_webrtc_info(
@@ -536,6 +537,9 @@ def get_webrtc_info(
             webrtc_library_dir=os.path.join(webrtc_install_dir, "lib"),
             clang_dir=os.path.join(install_dir, "llvm", "clang"),
             libcxx_dir=os.path.join(install_dir, "llvm", "libcxx"),
+            libcxxabi_dir=os.path.join(
+                webrtc_install_dir, "include", "third_party", "libc++abi", "src"
+            ),
         )
     else:
         webrtc_build_source_dir = os.path.join(
@@ -556,6 +560,9 @@ def get_webrtc_info(
                 webrtc_build_source_dir, "src", "third_party", "llvm-build", "Release+Asserts"
             ),
             libcxx_dir=os.path.join(webrtc_build_source_dir, "src", "third_party", "libc++", "src"),
+            libcxxabi_dir=os.path.join(
+                webrtc_build_source_dir, "src", "third_party", "libc++abi", "src"
+            ),
         )
 
 
@@ -1701,7 +1708,10 @@ def get_build_platform() -> PlatformTarget:
     if arch in ("AMD64", "x86_64"):
         arch = "x86_64"
     elif arch in ("aarch64", "arm64"):
-        arch = "arm64"
+        if os == "ubuntu":
+            arch = "armv8"
+        else:
+            arch = "arm64"
     else:
         raise Exception(f"Arch {arch} not supported")
 
@@ -1800,8 +1810,8 @@ class Platform(object):
                 self._check(build.arch in ("x86_64", "arm64"))
         if target.os == "ubuntu":
             self._check(build.os == "ubuntu")
-            self._check(build.arch == "x86_64")
-            if target.arch == "x86_64":
+            self._check(build.arch in ("x86_64", "armv8"))
+            if build.arch == target.arch:
                 self._check(build.osver == target.osver)
         if target.os == "raspberry-pi-os":
             self._check(build.os == "ubuntu")

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2025.1.0.dev4"
+version = "2025.1.0.dev6"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -74,3 +74,7 @@ dev-dependencies = [
 [tool.ruff]
 target-version = "py310"
 line-length = 100
+
+
+[tool.pytest.ini_options]
+xfail_strict = true

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/run.py

@@ -127,7 +127,7 @@ def install_deps(
         install_cmake_args["platform"] = "macos-universal"
     elif platform.build.os == "ubuntu" and platform.build.arch == "x86_64":
         install_cmake_args["platform"] = "linux-x86_64"
-    elif platform.build.os == "ubuntu" and platform.build.arch == "arm64":
+    elif platform.build.os == "ubuntu" and platform.build.arch == "armv8":
         install_cmake_args["platform"] = "linux-aarch64"
     else:
         raise Exception("Failed to install CMake")
@@ -261,12 +261,24 @@ def main():
         if platform.target.os == "ubuntu":
             # クロスコンパイルの設定。
             # 本来は toolchain ファイルに書く内容
+
+            if platform.build.arch == "armv8":
+                # ビルド環境が armv8 の場合は libwebrtc のバイナリが使えないのでローカルの clang を利用する
+                cmake_args += [
+                    "-DCMAKE_C_COMPILER=clang-18",
+                    "-DCMAKE_CXX_COMPILER=clang++-18",
+                ]
+            else:
+                cmake_args += [
+                    f"-DCMAKE_C_COMPILER={os.path.join(webrtc_info.clang_dir, 'bin', 'clang')}",
+                    f"-DCMAKE_CXX_COMPILER={os.path.join(webrtc_info.clang_dir, 'bin', 'clang++')}",
+                ]
             cmake_args += [
-                f"-DCMAKE_C_COMPILER={os.path.join(webrtc_info.clang_dir, 'bin', 'clang')}",
-                f"-DCMAKE_CXX_COMPILER={os.path.join(webrtc_info.clang_dir, 'bin', 'clang++')}",
                 f"-DLIBCXX_INCLUDE_DIR={cmake_path(os.path.join(webrtc_info.libcxx_dir, 'include'))}",
+                f"-DLIBCXXABI_INCLUDE_DIR={cmake_path(os.path.join(webrtc_info.libcxxabi_dir, 'include'))}",
             ]
-            if platform.target.arch == "armv8":
+
+            if platform.build.arch != platform.target.arch:
                 sysroot = os.path.join(install_dir, "rootfs")
                 nb_cmake_dir = cmdcap(["uv", "run", "python", "-m", "nanobind", "--cmake_dir"])
                 cmake_args += [
@@ -279,7 +291,6 @@ def main():
                     "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH",
-                    f"-DCMAKE_SYSROOT={sysroot}",
                     f"-DPython_ROOT_DIR={cmake_path(os.path.join(sysroot, 'usr', 'include', 'python3.12'))}",
                     f"-DCMAKE_SYSROOT={sysroot}",
                     f"-DNB_CMAKE_DIR={nb_cmake_dir}",

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/src/sora_sdk/sora_sdk_ext.pyi

@@ -6,7 +6,7 @@ from numpy.typing import ArrayLike
 
 
 class Sora:
-    def __init__(self, use_hardware_encoder: bool | None = None, openh264: str | None = None) -> None: ...
+    def __init__(self, openh264: str | None = None, video_codec_preference: SoraVideoCodecPreference | None = None) -> None: ...
 
     def create_connection(self, signaling_urls: list[str], role: str, channel_id: str, client_id: Optional[str] = None, bundle_id: Optional[str] = None, metadata: Optional[dict] = None, signaling_notify_metadata: Optional[dict] = None, audio_source: Optional[SoraTrackInterface] = None, video_source: Optional[SoraTrackInterface] = None, audio_frame_transformer: Optional[SoraAudioFrameTransformer] = None, video_frame_transformer: Optional[SoraVideoFrameTransformer] = None, audio: Optional[bool] = None, video: Optional[bool] = None, audio_codec_type: Optional[str] = None, video_codec_type: Optional[str] = None, video_bit_rate: Optional[int] = None, audio_bit_rate: Optional[int] = None, video_vp9_params: Optional[dict] = None, video_av1_params: Optional[dict] = None, video_h264_params: Optional[dict] = None, audio_opus_params: Optional[dict] = None, simulcast: Optional[bool] = None, spotlight: Optional[bool] = None, spotlight_number: Optional[int] = None, simulcast_rid: Optional[str] = None, spotlight_focus_rid: Optional[str] = None, spotlight_unfocus_rid: Optional[str] = None, forwarding_filter: Optional[dict] = None, forwarding_filters: Optional[list[dict]] = None, data_channels: Optional[list[dict]] = None, data_channel_signaling: Optional[bool] = None, ignore_disconnect_websocket: Optional[bool] = None, data_channel_signaling_timeout: Optional[int] = None, disconnect_wait_timeout: Optional[int] = None, websocket_close_timeout: Optional[int] = None, websocket_connection_timeout: Optional[int] = None, audio_streaming_language_code: Optional[str] = None, insecure: Optional[bool] = None, client_cert: Optional[bytes] = None, client_key: Optional[bytes] = None, ca_cert: Optional[bytes] = None, proxy_url: Optional[str] = None, proxy_username: Optional[str] = None, proxy_password: Optional[str] = None, proxy_agent: Optional[str] = None, degradation_preference: Optional[SoraDegradationPreference] = None) -> SoraConnection: ...
 
@@ -322,6 +322,124 @@ class SoraVAD:
 
     def analyze(self, frame: SoraAudioFrame) -> float: ...
 
+class SoraVideoCodecCapability:
+    @property
+    def engines(self) -> list[SoraVideoCodecCapability.Engine]: ...
+
+    def to_json(self) -> object: ...
+
+    class Parameters:
+        @property
+        def version(self) -> str | None: ...
+
+        @property
+        def openh264_path(self) -> str | None: ...
+
+        @property
+        def vpl_impl(self) -> str | None: ...
+
+        @property
+        def vpl_impl_value(self) -> int | None: ...
+
+        @property
+        def nvcodec_gpu_device_name(self) -> str | None: ...
+
+    class Codec:
+        @property
+        def type(self) -> SoraVideoCodecType: ...
+
+        @property
+        def encoder(self) -> bool: ...
+
+        @property
+        def decoder(self) -> bool: ...
+
+        @property
+        def parameters(self) -> SoraVideoCodecCapability.Parameters: ...
+
+    class Engine:
+        @property
+        def name(self) -> SoraVideoCodecImplementation: ...
+
+        @property
+        def codecs(self) -> list[SoraVideoCodecCapability.Codec]: ...
+
+        @property
+        def parameters(self) -> SoraVideoCodecCapability.Parameters: ...
+
+class SoraVideoCodecImplementation(enum.IntEnum):
+    INTERNAL = 0
+
+    CISCO_OPENH264 = 1
+
+    INTEL_VPL = 2
+
+    NVIDIA_VIDEO_CODEC_SDK = 3
+
+class SoraVideoCodecPreference:
+    def __init__(self, codecs: Sequence[SoraVideoCodecPreference.Codec] = []) -> None: ...
+
+    @property
+    def codecs(self) -> list[SoraVideoCodecPreference.Codec]: ...
+
+    @codecs.setter
+    def codecs(self, arg: Sequence[SoraVideoCodecPreference.Codec], /) -> None: ...
+
+    def to_json(self) -> object: ...
+
+    def find(self, arg: SoraVideoCodecType, /) -> int | None: ...
+
+    def get_or_add(self, arg: SoraVideoCodecType, /) -> int: ...
+
+    def has_implementation(self, arg: SoraVideoCodecImplementation, /) -> bool: ...
+
+    def merge(self, arg: SoraVideoCodecPreference, /) -> None: ...
+
+    class Parameters:
+        def __init__(self) -> None: ...
+
+    class Codec:
+        @overload
+        def __init__(self) -> None: ...
+
+        @overload
+        def __init__(self, type: SoraVideoCodecType, encoder: SoraVideoCodecImplementation | None = None, decoder: SoraVideoCodecImplementation | None = None, parameters: SoraVideoCodecPreference.Parameters = ...) -> None: ...
+
+        @property
+        def type(self) -> SoraVideoCodecType: ...
+
+        @type.setter
+        def type(self, arg: SoraVideoCodecType, /) -> None: ...
+
+        @property
+        def encoder(self) -> SoraVideoCodecImplementation | None: ...
+
+        @encoder.setter
+        def encoder(self, arg: SoraVideoCodecImplementation, /) -> None: ...
+
+        @property
+        def decoder(self) -> SoraVideoCodecImplementation | None: ...
+
+        @decoder.setter
+        def decoder(self, arg: SoraVideoCodecImplementation, /) -> None: ...
+
+        @property
+        def parameters(self) -> SoraVideoCodecPreference.Parameters: ...
+
+        @parameters.setter
+        def parameters(self, arg: SoraVideoCodecPreference.Parameters, /) -> None: ...
+
+class SoraVideoCodecType(enum.IntEnum):
+    VP8 = 1
+
+    VP9 = 2
+
+    H264 = 4
+
+    H265 = 5
+
+    AV1 = 3
+
 class SoraVideoFrame:
     def data(self) -> Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3))]: ...
 
@@ -357,4 +475,8 @@ class SoraVideoSource(SoraTrackInterface):
     @overload
     def on_captured(self, ndarray: Annotated[ArrayLike, dict(dtype='uint8', shape=(None, None, 3), order='C', device='cpu')], timestamp_us: int) -> None: ...
 
+def create_video_codec_preference_from_implementation(arg0: SoraVideoCodecCapability, arg1: SoraVideoCodecImplementation, /) -> SoraVideoCodecPreference: ...
+
 def enable_libwebrtc_log(arg: SoraLoggingSeverity, /) -> None: ...
+
+def get_video_codec_capability(openh264: str | None = None) -> SoraVideoCodecCapability: ...

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sora_sdk
-Version: 2025.1.0.dev4
+Version: 2025.1.0.dev6
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -290,15 +290,15 @@ PyPI 経由ではインストールできません。
 
 ## 対応プラットフォーム
 
-- Windows 11 x86_64
-- Windows Server 2022 x86_64
-- macOS Sequoia 15 arm64
-- macOS Ventura 14 arm64
 - Ubuntu 24.04 LTS x86_64
 - Ubuntu 24.04 LTS arm64
 - Ubuntu 22.04 LTS x86_64
 - Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
   - PyPI からではなくパッケージファイルを利用してください
+- macOS Sequoia 15 arm64
+- macOS Ventura 14 arm64
+- Windows 11 x86_64
+- Windows Server 2022 x86_64
 
 ### macOS の対応バージョン
 
@@ -323,6 +323,7 @@ PyPI 経由ではインストールできません。
 
 - Windows 11 arm64
 - Ubuntu 22.04 arm64
+- Ubuntu 22.04 arm64 (NVIDIA Jetson JetPack SDK 6.1)
 - Ubuntu 20.04 arm64 (NVIDIA Jetson JetPack SDK 5)
 - AMD Video Core Next (VCN) 対応
   - VP9 / AV1 / H.264 / H.265

{sora_sdk-2025.1.0.dev4 → sora_sdk-2025.1.0.dev6}/src/sora_sdk.egg-info/SOURCES.txt

@@ -15,14 +15,17 @@ src/sora_sdk.egg-info/PKG-INFO
 src/sora_sdk.egg-info/SOURCES.txt
 src/sora_sdk.egg-info/dependency_links.txt
 src/sora_sdk.egg-info/top_level.txt
+tests/test_apple_video_toolbox.py
 tests/test_authz.py
 tests/test_authz_simulcast.py
 tests/test_ca_cert.py
+tests/test_capability.py
 tests/test_degradation_preference.py
 tests/test_encoded_transform.py
-tests/test_macos.py
+tests/test_intel_vpl.py
 tests/test_messaging.py
 tests/test_messaging_header.py
+tests/test_nvidia_video_codec_sdk.py
 tests/test_openh264.py
 tests/test_re_offer_re_answer_sdp.py
 tests/test_sendonly_recvonly.py

sora_sdk-2025.1.0.dev4/tests/test_macos.py → sora_sdk-2025.1.0.dev6/tests/test_apple_video_toolbox.py

@@ -31,7 +31,6 @@ def test_macos_video_hwa_sendonly(setup, video_codec_type):
         video=True,
         video_codec_type=video_codec_type,
         metadata=metadata,
-        use_hwa=True,
     )
     sendonly.connect(fake_video=True)
 
@@ -117,7 +116,6 @@ def test_macos_simulcast(
         metadata=metadata,
         video_width=video_width,
         video_height=video_height,
-        use_hwa=True,
     )
     sendonly.connect(fake_video=True)
 
@@ -157,7 +155,7 @@ def test_macos_simulcast(
                 assert "SimulcastEncoderAdapter" in s["encoderImplementation"]
             assert expected_implementation in s["encoderImplementation"]
 
-            assert s["bytesSent"] > 1000
+            assert s["bytesSent"] > 500
             assert s["packetsSent"] > 5
             # targetBitrate が指定したビットレートの 90% 以上、100% 以下に収まることを確認
             expected_bitrate = video_bit_rate * 1000
@@ -204,7 +202,6 @@ def test_macos_h264_sendonly_recvonly(setup):
         video=True,
         video_codec_type="H264",
         metadata=metadata,
-        use_hwa=True,
     )
     sendonly.connect()
 
@@ -213,7 +210,6 @@ def test_macos_h264_sendonly_recvonly(setup):
         SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
-        use_hwa=True,
     )
     recvonly.connect()
 
@@ -264,7 +260,6 @@ def test_macos_h265_sendonly_recvonly(setup):
         video=True,
         video_codec_type="H265",
         metadata=metadata,
-        use_hwa=True,
     )
     sendonly.connect()
 
@@ -273,7 +268,6 @@ def test_macos_h265_sendonly_recvonly(setup):
         SoraRole.RECVONLY,
         channel_id,
         metadata=metadata,
-        use_hwa=True,
     )
     recvonly.connect()
 

sora_sdk-2025.1.0.dev6/tests/test_capability.py

@@ -0,0 +1,94 @@
+import sys
+import time
+import uuid
+
+import pytest
+from client import SoraClient, SoraRole
+
+from sora_sdk import (
+    SoraVideoCodecImplementation,
+    SoraVideoCodecPreference,
+    SoraVideoCodecType,
+    create_video_codec_preference_from_implementation,
+    get_video_codec_capability,
+)
+
+
+def test_capability(setup):
+    openh264_path = setup.get("openh264_path")
+    capability = get_video_codec_capability(openh264=openh264_path)
+    has_internal = False
+    has_openh264 = False
+    for engine in capability.engines:
+        if engine.name == SoraVideoCodecImplementation.INTERNAL:
+            has_internal = True
+        if engine.name == SoraVideoCodecImplementation.CISCO_OPENH264:
+            has_openh264 = True
+    assert has_internal and has_openh264
+
+
+def test_preference(setup):
+    openh264_path = setup.get("openh264_path")
+    capability = get_video_codec_capability(openh264=openh264_path)
+    preference = create_video_codec_preference_from_implementation(
+        capability, SoraVideoCodecImplementation.CISCO_OPENH264
+    )
+    assert preference.has_implementation(SoraVideoCodecImplementation.CISCO_OPENH264)
+
+
+def test_preference_invalid(setup):
+    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()}"
+
+    # opneh264 のパスを設定してないのに H264 エンコーダを使おうとしているので Sora 生成時にエラーになる
+    with pytest.raises(RuntimeError):
+        SoraClient(
+            signaling_urls,
+            SoraRole.SENDONLY,
+            channel_id,
+            metadata=metadata,
+            audio=False,
+            video=True,
+            video_codec_type="H264",
+            video_codec_preference=SoraVideoCodecPreference(
+                codecs=[
+                    SoraVideoCodecPreference.Codec(
+                        type=SoraVideoCodecType.H264,
+                        encoder=SoraVideoCodecImplementation.CISCO_OPENH264,
+                    )
+                ]
+            ),
+        )
+
+
+def test_preference_vp8(setup):
+    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,
+        metadata=metadata,
+        audio=False,
+        video=True,
+        video_codec_type="VP8",
+        video_codec_preference=SoraVideoCodecPreference(
+            codecs=[
+                SoraVideoCodecPreference.Codec(
+                    type=SoraVideoCodecType.VP8, encoder=SoraVideoCodecImplementation.INTERNAL
+                )
+            ]
+        ),
+    )
+    sendonly.connect(fake_video=True)
+
+    time.sleep(5)
+
+    sendonly.disconnect()