sora-sdk 2025.2.3__tar.gz → 2025.3.0__tar.gz

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/MANIFEST.in

@@ -1,3 +1,4 @@
 include buildbase.py
 include run.py
 include pypath.py
+include VERSION

{sora_sdk-2025.2.3/src/sora_sdk.egg-info → sora_sdk-2025.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.2.3
+Version: 2025.3.0
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -93,20 +93,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 ## sora_sdk パッケージの追加
 
-### uv
-
-[uv](https://docs.astral.sh/uv/)
+[uv](https://docs.astral.sh/uv/) の利用を推奨します。
 
 ```bash
 uv add sora_sdk
 ```
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -128,13 +120,17 @@ PyPI 経由ではインストールできません。
 - 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 からではなくパッケージファイルを利用してください
+- Ubuntu 22.04 LTS arm64
 - macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - Windows 11 x86_64
 - Windows Server 2025 x86_64
 
+### Jetson 向け
+
+- Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
+  - PyPI からではなくパッケージファイルを利用してください
+
 ### macOS の対応バージョン
 
 直近の 2 バージョンをサポートします。
@@ -157,7 +153,6 @@ 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)
 

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/README.md

@@ -73,20 +73,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 ## sora_sdk パッケージの追加
 
-### uv
-
-[uv](https://docs.astral.sh/uv/)
+[uv](https://docs.astral.sh/uv/) の利用を推奨します。
 
 ```bash
 uv add sora_sdk
 ```
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -108,13 +100,17 @@ PyPI 経由ではインストールできません。
 - 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 からではなくパッケージファイルを利用してください
+- Ubuntu 22.04 LTS arm64
 - macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - Windows 11 x86_64
 - Windows Server 2025 x86_64
 
+### Jetson 向け
+
+- Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
+  - PyPI からではなくパッケージファイルを利用してください
+
 ### macOS の対応バージョン
 
 直近の 2 バージョンをサポートします。
@@ -137,7 +133,6 @@ 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)
 

sora_sdk-2025.3.0/VERSION

@@ -0,0 +1 @@
+2025.3.0

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "contact+pypi@shiguredo.jp" }]
-version = "2025.2.3"
+dynamic = ["version"]
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = "Apache-2.0"
@@ -20,26 +20,24 @@ Documentation = "https://sora-python-sdk.shiguredo.jp"
 Discord = "https://discord.gg/shiguredo"
 
 [build-system]
-requires = ["setuptools==80.0", "wheel==0.45.1"]
+requires = ["setuptools==80.9", "wheel==0.45.1"]
 build-backend = "setuptools.build_meta"
 
 [tool.uv]
 python-preference = "only-managed"
 dev-dependencies = [
     "nanobind==2.7.0",
-    "setuptools==80.0",
+    "setuptools==80.9",
     "build==1.2.2.post1",
     "wheel==0.45.1",
-    "typing-extensions",
-    "python-dotenv",
     "numpy",
     "httpx",
     "pytest",
     "ruff",
-    "mypy",
     "pyjwt",
     "pytest-repeat",
-    "psutil",
+    "ty",
+    "pydantic-settings",
 ]
 
 [tool.ruff]

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/run.py

@@ -1,5 +1,6 @@
 import argparse
 import hashlib
+import importlib.metadata
 import multiprocessing
 import os
 import shlex
@@ -30,7 +31,7 @@ from buildbase import (
     mkdir_p,
     read_version_file,
 )
-from pypath import get_python_include_dir, get_python_library, get_python_version
+from pypath import get_python_include_dir, get_python_version
 
 BASE_DIR = os.path.abspath(os.path.dirname(__file__))
 
@@ -46,7 +47,7 @@ def install_deps(
     local_sora_cpp_sdk_dir: Optional[str],
     local_sora_cpp_sdk_args: List[str],
 ):
-    version = read_version_file("VERSION")
+    version = read_version_file("DEPS")
 
     # multistrap を使った sysroot の構築
     if (
@@ -173,6 +174,7 @@ AVAILABLE_TARGETS = [
     "macos_arm64",
     "ubuntu-22.04_x86_64",
     "ubuntu-24.04_x86_64",
+    "ubuntu-22.04_armv8",
     "ubuntu-24.04_armv8",
     "ubuntu-22.04_armv8_jetson",
 ]
@@ -199,6 +201,8 @@ def main():
         platform = Platform("ubuntu", "22.04", "x86_64")
     elif args.target == "ubuntu-24.04_x86_64":
         platform = Platform("ubuntu", "24.04", "x86_64")
+    elif args.target == "ubuntu-22.04_armv8":
+        platform = Platform("ubuntu", "22.04", "armv8")
     elif args.target == "ubuntu-24.04_armv8":
         platform = Platform("ubuntu", "24.04", "armv8")
     elif args.target == "ubuntu-22.04_armv8_jetson":
@@ -244,19 +248,15 @@ def main():
         cmake_args = []
         cmake_args.append(f"-DCMAKE_BUILD_TYPE={configuration}")
         cmake_args.append(f"-DTARGET_OS={platform.target.os}")
+        cmake_args.append(f"-DSORA_PYTHON_SDK_VERSION={importlib.metadata.version('sora-sdk')}")
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")
         cmake_args.append(f"-DOPENH264_DIR={cmake_path(os.path.join(install_dir, 'openh264'))}")
         python_version = get_python_version()
-        cmake_args.append(f"-DPYTHON_VERSION_STRING={python_version}")
-        cmake_args.append(f"-DPYTHON_INCLUDE_DIR={get_python_include_dir(python_version)}")
-        cmake_args.append(f"-DPYTHON_EXECUTABLE={cmake_path(sys.executable)}")
-        python_library = get_python_library(python_version)
-        if python_library is None:
-            raise Exception("Failed to get Python library")
-        cmake_args.append(f"-DPYTHON_LIBRARY={cmake_path(python_library)}")
+        cmake_args.append(f"-DPython_INCLUDE_DIR={get_python_include_dir(python_version)}")
+        cmake_args.append(f"-DPython_EXECUTABLE={cmake_path(sys.executable)}")
 
         if platform.target.os == "ubuntu":
             # クロスコンパイルの設定。
@@ -265,8 +265,8 @@ def main():
             if platform.build.arch == "armv8":
                 # ビルド環境が armv8 の場合は libwebrtc のバイナリが使えないのでローカルの clang を利用する
                 cmake_args += [
-                    "-DCMAKE_C_COMPILER=clang-18",
-                    "-DCMAKE_CXX_COMPILER=clang++-18",
+                    "-DCMAKE_C_COMPILER=clang-19",
+                    "-DCMAKE_CXX_COMPILER=clang++-19",
                 ]
             else:
                 cmake_args += [
@@ -280,7 +280,8 @@ def main():
 
             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"])
+                python_version = get_python_version()
+                python_version_short = ".".join(python_version.split(".")[:2])
                 cmake_args += [
                     "-DCMAKE_SYSTEM_NAME=Linux",
                     "-DCMAKE_SYSTEM_PROCESSOR=aarch64",
@@ -291,10 +292,8 @@ def main():
                     "-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH",
                     "-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH",
-                    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}",
-                    "-DNB_SUFFIX=.cpython-312-aarch64-linux-gnu.so",
+                    f"-DNB_SUFFIX=.cpython-{python_version_short.replace('.', '')}-aarch64-linux-gnu.so",
                 ]
         elif platform.target.os == "macos":
             sysroot = cmdcap(["xcrun", "--sdk", "macosx", "--show-sdk-path"])

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/setup.py

@@ -13,16 +13,26 @@ from buildbase import PlatformTarget, cd, get_build_platform  # noqa: E402
 
 
 def run_setup(build_platform, target_platform):
+    with open(os.path.join(BASE_DIR, "VERSION"), "r") as f:
+        version = f.read().strip()
+
+    build_profile = os.getenv("BUILD_PROFILE")
+    if build_profile == "debug":
+        version += "+debug"
+
     plat = None
     if target_platform.os == "jetson":
         plat = "manylinux_2_17_aarch64.manylinux2014_aarch64"
     elif target_platform.os == "ubuntu" and target_platform.arch == "armv8":
-        plat = "manylinux_2_17_aarch64.manylinux2014_aarch64"
+        if target_platform.osver == "22.04":
+            plat = "manylinux_2_31_aarch64"
+        if target_platform.osver == "24.04":
+            plat = "manylinux_2_35_aarch64"
     elif target_platform.os == "ubuntu" and target_platform.arch == "x86_64":
         if target_platform.osver == "22.04":
-            plat = "manylinux_2_17_x86_64.manylinux2014_x86_64"
+            plat = "manylinux_2_31_x86_64"
         if target_platform.osver == "24.04":
-            plat = "manylinux_2_17_x86_64.manylinux2014_x86_64"
+            plat = "manylinux_2_35_x86_64"
 
     class bdist_wheel(_bdist_wheel):
         def finalize_options(self):
@@ -35,6 +45,7 @@ def run_setup(build_platform, target_platform):
             return impl, impl, plat if plat is not None else plat2
 
     setup(
+        version=version,
         url="https://github.com/shiguredo/sora-python-sdk",
         packages=["sora_sdk"],
         package_dir={"": "src"},
@@ -54,6 +65,8 @@ def main():
     target = os.getenv("SORA_SDK_TARGET")
     if target is None:
         target_platform = build_platform
+    elif target == "ubuntu-22.04_armv8":
+        target_platform = PlatformTarget("ubuntu", "22.04", "armv8")
     elif target == "ubuntu-24.04_armv8":
         target_platform = PlatformTarget("ubuntu", "24.04", "armv8")
     elif target == "ubuntu-22.04_armv8_jetson":

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/src/sora_sdk/__init__.py

@@ -1,5 +1,24 @@
 from .sora_sdk_ext import *  # noqa: F401,F403
 
+# インストールされたパッケージの場合は importlib.metadata から取得
+# 開発環境の場合は VERSION ファイルから取得
+try:
+    from importlib.metadata import version, PackageNotFoundError
+    try:
+        __version__ = version("sora_sdk")
+    except PackageNotFoundError:
+        # パッケージがインストールされていない場合（開発環境）
+        import os
+        _version_file = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "VERSION")
+        if os.path.exists(_version_file):
+            with open(_version_file, "r") as f:
+                __version__ = f.read().strip()
+        else:
+            __version__ = "unknown"
+except ImportError:
+    # Python 3.8 以前の互換性のため
+    __version__ = "unknown"
+
 """
 sink はそれぞれ track が必要で参照を保持する必要がある
 しかしながら、 sink の C++ 側で shared_ptr として track を持つと、

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/src/sora_sdk/sora_sdk_ext.pyi

@@ -226,6 +226,12 @@ class SoraConnection:
     @on_message.setter
     def on_message(self, arg: Callable[[str, bytes], None], /) -> None: ...
 
+    @property
+    def on_rpc(self) -> Callable[[bytes], None]: ...
+
+    @on_rpc.setter
+    def on_rpc(self, arg: Callable[[bytes], None], /) -> None: ...
+
     @property
     def on_switched(self) -> Callable[[str], None]: ...
 
@@ -485,7 +491,7 @@ def create_video_codec_preference_from_implementation(arg0: SoraVideoCodecCapabi
 class Sora:
     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: ...
+    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, user_agent: Optional[str] = None) -> SoraConnection: ...
 
     def create_audio_source(self, channels: int, sample_rate: int) -> SoraAudioSource: ...
 

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sora_sdk
-Version: 2025.2.3
+Version: 2025.3.0
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -93,20 +93,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 ## sora_sdk パッケージの追加
 
-### uv
-
-[uv](https://docs.astral.sh/uv/)
+[uv](https://docs.astral.sh/uv/) の利用を推奨します。
 
 ```bash
 uv add sora_sdk
 ```
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -128,13 +120,17 @@ PyPI 経由ではインストールできません。
 - 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 からではなくパッケージファイルを利用してください
+- Ubuntu 22.04 LTS arm64
 - macOS Sequoia 15 arm64
 - macOS Ventura 14 arm64
 - Windows 11 x86_64
 - Windows Server 2025 x86_64
 
+### Jetson 向け
+
+- Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
+  - PyPI からではなくパッケージファイルを利用してください
+
 ### macOS の対応バージョン
 
 直近の 2 バージョンをサポートします。
@@ -157,7 +153,6 @@ 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)
 

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/src/sora_sdk.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 MANIFEST.in
 README.md
+VERSION
 buildbase.py
 pypath.py
 pyproject.toml
@@ -38,4 +39,5 @@ tests/test_simulcast.py
 tests/test_sora_disconnect.py
 tests/test_type_disconnect.py
 tests/test_type_switched.py
-tests/test_vad.py
+tests/test_vad.py
+tests/test_version.py

{sora_sdk-2025.2.3 → sora_sdk-2025.3.0}/tests/test_amd_amf.py

@@ -1,7 +1,5 @@
 import os
-import sys
 import time
-import uuid
 
 import pytest
 from client import (
@@ -21,7 +19,7 @@ from sora_sdk import (
 
 
 @pytest.mark.skipif(os.environ.get("AMD_AMF") is None, reason="AMD AMF でのみ実行する")
-def test_amd_amf_available(setup):
+def test_amd_amf_available(settings):
     capability = get_video_codec_capability()
 
     amd_amf_available = False
@@ -68,26 +66,18 @@ def test_amd_amf_available(setup):
         "H265",
     ],
 )
-def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
+def test_amd_amf_sendonly_recvonly(settings, video_codec_type):
     if not is_codec_supported(video_codec_type, SoraVideoCodecImplementation.AMD_AMF):
         pytest.skip(
             f"このチップでは {video_codec_type} のエンコード/デコードの両方がサポートされていません"
         )
 
-    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,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
-        metadata=metadata,
         video_codec_preference=SoraVideoCodecPreference(
             codecs=[
                 SoraVideoCodecPreference.Codec(
@@ -100,10 +90,8 @@ def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
     sendonly.connect(fake_video=True)
 
     recvonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.RECVONLY,
-        channel_id,
-        metadata=metadata,
         video_codec_preference=SoraVideoCodecPreference(
             codecs=[
                 SoraVideoCodecPreference.Codec(
@@ -197,7 +185,7 @@ def test_amd_amf_sendonly_recvonly(setup, video_codec_type):
     ],
 )
 def test_amd_amf_simulcast(
-    setup,
+    settings,
     video_codec_type,
     expected_implementation,
     video_width,
@@ -207,24 +195,16 @@ def test_amd_amf_simulcast(
     if not is_codec_supported(video_codec_type, SoraVideoCodecImplementation.AMD_AMF):
         pytest.skip(f"このチップでは {video_codec_type} のエンコードがサポートされていません")
 
-    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()}"
-
     video_bit_rate = default_video_bit_rate(video_codec_type, video_width, video_height)
 
     sendonly = SoraClient(
-        signaling_urls,
+        settings,
         SoraRole.SENDONLY,
-        channel_id,
         simulcast=True,
         audio=False,
         video=True,
         video_codec_type=video_codec_type,
         video_bit_rate=video_bit_rate,
-        metadata=metadata,
         video_width=video_width,
         video_height=video_height,
         video_codec_preference=SoraVideoCodecPreference(