sora-sdk 2024.4.0.dev4__tar.gz → 2024.4.0.dev5__tar.gz

{sora_sdk-2024.4.0.dev4/src/sora_sdk.egg-info → sora_sdk-2024.4.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev4
+Version: 2024.4.0.dev5
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -251,18 +251,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 [Sora Python SDK](https://sora-python-sdk.shiguredo.jp/)
 
-## サンプル集
+## 例
 
-[examples](examples) を参照してください。
+[shiguredo/sora-python-sdk-examples](https://github.com/shiguredo/sora-python-sdk-examples)
 
 ## sora_sdk パッケージの追加
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### uv
 
 [uv](https://docs.astral.sh/uv/)
@@ -272,6 +266,12 @@ uv add sora_sdk
 uv sync
 ```
 
+### pip
+
+```bash
+pip install sora_sdk
+```
+
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -354,8 +354,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-このリポジトリに含まれる `shiguremaru.png` ファイルのライセンスは [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.ja) です。
-
 ## OpenH264
 
 <https://www.openh264.org/BINARY_LICENSE.txt>

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/README.md

@@ -54,18 +54,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 [Sora Python SDK](https://sora-python-sdk.shiguredo.jp/)
 
-## サンプル集
+## 例
 
-[examples](examples) を参照してください。
+[shiguredo/sora-python-sdk-examples](https://github.com/shiguredo/sora-python-sdk-examples)
 
 ## sora_sdk パッケージの追加
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### uv
 
 [uv](https://docs.astral.sh/uv/)
@@ -75,6 +69,12 @@ uv add sora_sdk
 uv sync
 ```
 
+### pip
+
+```bash
+pip install sora_sdk
+```
+
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -157,8 +157,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-このリポジトリに含まれる `shiguremaru.png` ファイルのライセンスは [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.ja) です。
-
 ## OpenH264
 
 <https://www.openh264.org/BINARY_LICENSE.txt>

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/buildbase.py

@@ -687,6 +687,7 @@ def build_and_install_boost(
     android_ndk,
     native_api_level,
     address_model="64",
+    runtime_link=None,
 ):
     version_underscore = version.replace(".", "_")
     archive = download(
@@ -697,7 +698,8 @@ def build_and_install_boost(
     with cd(os.path.join(build_dir, "boost")):
         bootstrap = ".\\bootstrap.bat" if target_os == "windows" else "./bootstrap.sh"
         b2 = "b2" if target_os == "windows" else "./b2"
-        runtime_link = "static" if target_os == "windows" else "shared"
+        if runtime_link is None:
+            runtime_link = "static" if target_os == "windows" else "shared"
 
         # Windows かつ Boost 1.85.0 の場合はパッチを当てる
         if target_os == "windows" and version == "1.85.0":
@@ -862,23 +864,23 @@ def install_sora(version, source_dir, install_dir, platform: str):
     extract(archive, output_dir=install_dir, output_dirname="sora")
 
 
-def install_sora_and_deps(platform: str, source_dir: str, install_dir: str):
-    version = read_version_file("VERSION")
-
+def install_sora_and_deps(
+    sora_version: str, boost_version: str, platform: str, source_dir: str, install_dir: str
+):
     # Boost
     install_boost_args = {
-        "version": version["BOOST_VERSION"],
+        "version": boost_version,
         "version_file": os.path.join(install_dir, "boost.version"),
         "source_dir": source_dir,
         "install_dir": install_dir,
-        "sora_version": version["SORA_CPP_SDK_VERSION"],
+        "sora_version": sora_version,
         "platform": platform,
     }
     install_boost(**install_boost_args)
 
     # Sora C++ SDK
     install_sora_args = {
-        "version": version["SORA_CPP_SDK_VERSION"],
+        "version": sora_version,
         "version_file": os.path.join(install_dir, "sora.version"),
         "source_dir": source_dir,
         "install_dir": install_dir,
@@ -1768,8 +1770,10 @@ class Platform(object):
             self._check(p.arch == "armv8")
         elif p.os in ("ios", "android"):
             self._check(p.arch is None)
+        elif p.os == "ubuntu":
+            self._check(p.arch in ("x86_64", "armv8"))
         else:
-            self._check(p.arch in ("x86_64", "arm64"))
+            self._check(p.arch in ("x86_64", "arm64", "hololens2"))
 
     def __init__(self, target_os, target_osver, target_arch, target_extra=None):
         build = get_build_platform()
@@ -1779,7 +1783,7 @@ class Platform(object):
         self._check_platform_target(target)
 
         if target.os == "windows":
-            self._check(target.arch == "x86_64")
+            self._check(target.arch in ("x86_64", "arm64", "hololens2"))
             self._check(build.os == "windows")
             self._check(build.arch == "x86_64")
         if target.os == "macos":
@@ -1797,7 +1801,8 @@ class Platform(object):
         if target.os == "ubuntu":
             self._check(build.os == "ubuntu")
             self._check(build.arch == "x86_64")
-            self._check(build.osver == target.osver)
+            if target.arch == "x86_64":
+                self._check(build.osver == target.osver)
         if target.os == "raspberry-pi-os":
             self._check(build.os == "ubuntu")
             self._check(build.arch == "x86_64")

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/pyproject.toml

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

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/run.py

@@ -49,7 +49,11 @@ def install_deps(
     version = read_version_file("VERSION")
 
     # multistrap を使った sysroot の構築
-    if platform.target.os == "jetson":
+    if (
+        platform.target.os == "jetson"
+        or platform.target.os == "ubuntu"
+        and platform.target.arch == "armv8"
+    ):
         conf = os.path.join("multistrap", f"{platform.target.package_name}.conf")
         # conf ファイルのハッシュ値をバージョンとする
         version_md5 = hashlib.md5(open(conf, "rb").read()).hexdigest()
@@ -131,7 +135,13 @@ def install_deps(
 
     # Sora C++ SDK
     if local_sora_cpp_sdk_dir is None:
-        install_sora_and_deps(platform.target.package_name, source_dir, install_dir)
+        install_sora_and_deps(
+            version["SORA_CPP_SDK_VERSION"],
+            version["BOOST_VERSION"],
+            platform.target.package_name,
+            source_dir,
+            install_dir,
+        )
     else:
         build_sora(
             platform.target.package_name,
@@ -163,6 +173,7 @@ AVAILABLE_TARGETS = [
     "macos_arm64",
     "ubuntu-22.04_x86_64",
     "ubuntu-24.04_x86_64",
+    "ubuntu-24.04_armv8",
     "ubuntu-22.04_armv8_jetson",
 ]
 
@@ -188,6 +199,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-24.04_armv8":
+        platform = Platform("ubuntu", "24.04", "armv8")
     elif args.target == "ubuntu-22.04_armv8_jetson":
         platform = Platform("jetson", None, "armv8", "ubuntu-22.04")
     else:
@@ -219,7 +232,7 @@ def main():
         webrtc_info = get_webrtc_info(
             webrtc_platform, args.local_webrtc_build_dir, install_dir, args.debug
         )
-        
+
         sora_info = get_sora_info(
             webrtc_platform, args.local_sora_cpp_sdk_dir, install_dir, args.debug
         )
@@ -249,6 +262,25 @@ def main():
                 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'))}",
             ]
+            if platform.target.arch == "armv8":
+                sysroot = os.path.join(install_dir, "rootfs")
+                nb_cmake_dir = cmdcap(["uv", "run", "python", "-m", "nanobind", "--cmake_dir"])
+                cmake_args += [
+                    "-DCMAKE_SYSTEM_NAME=Linux",
+                    "-DCMAKE_SYSTEM_PROCESSOR=aarch64",
+                    "-DCMAKE_C_COMPILER_TARGET=aarch64-linux-gnu",
+                    "-DCMAKE_CXX_COMPILER_TARGET=aarch64-linux-gnu",
+                    f"-DCMAKE_FIND_ROOT_PATH={sysroot}",
+                    "-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER",
+                    "-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}",
+                    "-DNB_SUFFIX=.cpython-312-aarch64-linux-gnu.so",
+                ]
         elif platform.target.os == "macos":
             sysroot = cmdcap(["xcrun", "--sdk", "macosx", "--show-sdk-path"])
             cmake_args += [

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/setup.py

@@ -16,6 +16,8 @@ def run_setup(build_platform, target_platform):
     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"
     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"
@@ -52,6 +54,8 @@ def main():
     target = os.getenv("SORA_SDK_TARGET")
     if target is None:
         target_platform = build_platform
+    elif target == "ubuntu-24.04_armv8":
+        target_platform = PlatformTarget("ubuntu", "24.04", "armv8")
     elif target == "ubuntu-22.04_armv8_jetson":
         target_platform = PlatformTarget("jetson", None, "armv8", "ubuntu-22.04")
     else:

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5/src/sora_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sora_sdk
-Version: 2024.4.0.dev4
+Version: 2024.4.0.dev5
 Summary: WebRTC SFU Sora Python SDK
 Home-page: https://github.com/shiguredo/sora-python-sdk
 Author-email: "Shiguredo Inc." <contact+pypi@shiguredo.jp>
@@ -251,18 +251,12 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
 
 [Sora Python SDK](https://sora-python-sdk.shiguredo.jp/)
 
-## サンプル集
+## 例
 
-[examples](examples) を参照してください。
+[shiguredo/sora-python-sdk-examples](https://github.com/shiguredo/sora-python-sdk-examples)
 
 ## sora_sdk パッケージの追加
 
-### pip
-
-```bash
-pip install sora_sdk
-```
-
 ### uv
 
 [uv](https://docs.astral.sh/uv/)
@@ -272,6 +266,12 @@ uv add sora_sdk
 uv sync
 ```
 
+### pip
+
+```bash
+pip install sora_sdk
+```
+
 ### NVIDIA Jetson 向けパッケージ
 
 PyPI 経由ではインストールできません。
@@ -354,8 +354,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-このリポジトリに含まれる `shiguremaru.png` ファイルのライセンスは [CC BY-NC-ND 4.0](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.ja) です。
-
 ## OpenH264
 
 <https://www.openh264.org/BINARY_LICENSE.txt>

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/src/sora_sdk.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ 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_ca_cert.py
 tests/test_macos.py
 tests/test_messaging.py
 tests/test_openh264.py

sora_sdk-2024.4.0.dev5/tests/test_ca_cert.py

@@ -0,0 +1,107 @@
+import sys
+import time
+import uuid
+
+import pytest
+from client import Sendonly
+
+"""
+このテストは、Sora の CA 証明書が有効かどうかを確認するためのものです。
+接続先の Sora が Let's Encrypt の CA 証明書を使用している前提のテストになっています。
+"""
+
+# https://letsencrypt.org/certificates/
+# ISRG Root X1
+
+letsencrypt_org_ca_cert = """
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+"""
+
+# https://pki.goog/repository/
+
+pki_goog_ca_cert = """
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYD
+VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
+A1UEAxMLR1RTIFJvb3QgUjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
+WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
+IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzuhXyi
+QHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvR
+HYqjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBSATNbrdP9JNqPV2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D
+9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/Cr8deVl5c1RxYIigL9zC2L7F8AjEA8GE8
+p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+"""
+
+
+def test_ca_cert(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 = Sendonly(
+        signaling_urls,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        ca_cert=letsencrypt_org_ca_cert,
+    )
+    sendonly.connect(fake_audio=True, fake_video=True)
+
+    time.sleep(5)
+
+    sendonly.disconnect()
+
+
+@pytest.mark.xfail(reason="Invalid CA certificate")
+def test_ca_cert_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()}"
+
+    sendonly = Sendonly(
+        signaling_urls,
+        channel_id,
+        audio=True,
+        video=True,
+        metadata=metadata,
+        ca_cert=pki_goog_ca_cert,
+    )
+    sendonly.connect(fake_audio=True, fake_video=True)

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/tests/test_macos.py

@@ -11,7 +11,12 @@ GitHub Actions で Video Toolbox を送受信で利用しようとするとエ
 """
 
 
-def test_macos_h264_sendonly(setup):
+@pytest.mark.skipif(sys.platform != "darwin", reason="macOS でのみ実行する")
+@pytest.mark.parametrize(
+    "video_codec_type",
+    ["H264", "H265"],
+)
+def test_macos_video_hwa_sendonly(setup, video_codec_type):
     signaling_urls = setup.get("signaling_urls")
     channel_id_prefix = setup.get("channel_id_prefix")
     metadata = setup.get("metadata")
@@ -23,7 +28,7 @@ def test_macos_h264_sendonly(setup):
         channel_id,
         audio=False,
         video=True,
-        video_codec_type="H264",
+        video_codec_type=video_codec_type,
         metadata=metadata,
         use_hwa=True,
     )
@@ -34,43 +39,7 @@ def test_macos_h264_sendonly(setup):
     assert sendonly.connect_message is not None
     assert sendonly.connect_message["channel_id"] == channel_id
     assert "video" in sendonly.connect_message
-    assert sendonly.connect_message["video"]["codec_type"] == "H264"
-
-    sendonly_stats = sendonly.get_stats()
-
-    sendonly.disconnect()
-
-    # codec が無かったら StopIteration 例外が上がる
-    codec_stats = next(s for s in sendonly_stats if s.get("type") == "codec")
-    # H.264 が採用されているかどうか確認する
-    assert codec_stats["mimeType"] == "video/H264"
-
-    # outbound-rtp が無かったら StopIteration 例外が上がる
-    outbound_rtp_stats = next(s for s in sendonly_stats if s.get("type") == "outbound-rtp")
-    assert outbound_rtp_stats["encoderImplementation"] == "VideoToolbox"
-    assert outbound_rtp_stats["bytesSent"] > 0
-    assert outbound_rtp_stats["packetsSent"] > 0
-
-
-def test_macos_h265_sendonly(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 = Sendonly(
-        signaling_urls,
-        channel_id,
-        audio=False,
-        video=True,
-        video_codec_type="H265",
-        metadata=metadata,
-        use_hwa=True,
-    )
-    sendonly.connect(fake_video=True)
-
-    time.sleep(5)
+    assert sendonly.connect_message["video"]["codec_type"] == video_codec_type
 
     sendonly_stats = sendonly.get_stats()
 
@@ -79,7 +48,7 @@ def test_macos_h265_sendonly(setup):
     # codec が無かったら StopIteration 例外が上がる
     codec_stats = next(s for s in sendonly_stats if s.get("type") == "codec")
     # H.264 が採用されているかどうか確認する
-    assert codec_stats["mimeType"] == "video/H265"
+    assert codec_stats["mimeType"] == f"video/{video_codec_type}"
 
     # outbound-rtp が無かったら StopIteration 例外が上がる
     outbound_rtp_stats = next(s for s in sendonly_stats if s.get("type") == "outbound-rtp")

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/tests/test_openh264.py

@@ -6,6 +6,7 @@ import pytest
 from client import Recvonly, Sendonly
 
 
+@pytest.mark.skipif(sys.platform not in ["darwin", "linux"], reason="macOSとLinuxでのみ実行する")
 def test_openh264_sendonly_recvonly(setup):
     signaling_urls = setup.get("signaling_urls")
     channel_id_prefix = setup.get("channel_id_prefix")
@@ -65,17 +66,14 @@ def test_openh264_sendonly_recvonly(setup):
     assert inbound_rtp_stats["packetsReceived"] > 0
 
 
-@pytest.fixture(
-    params=[
+@pytest.mark.skipif(sys.platform not in ["darwin", "linux"], reason="macOSとLinuxでのみ実行する")
+@pytest.mark.parametrize(
+    "video_codec_type,expected_implementation",
+    [
         ("H264", "SimulcastEncoderAdapter (OpenH264, OpenH264, OpenH264)"),
-    ]
+    ],
 )
-def video_codec_params(request):
-    return request.param
-
-
-def test_openh264_simulcast(setup, video_codec_params):
-    video_codec, expected_implementation = video_codec_params
+def test_openh264_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")
@@ -90,7 +88,7 @@ def test_openh264_simulcast(setup, video_codec_params):
         simulcast=True,
         audio=False,
         video=True,
-        video_codec_type=video_codec,
+        video_codec_type=video_codec_type,
         video_bit_rate=3000,
         metadata=metadata,
         video_width=1280,
@@ -108,7 +106,7 @@ def test_openh264_simulcast(setup, video_codec_params):
 
     # 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}"
+    assert sendonly_codec_stats["mimeType"] == f"video/{video_codec_type}"
 
     # 複数のoutbound-rtp統計情報を取得
     outbound_rtp_stats = [

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/tests/test_signaling_message.py

@@ -1,4 +1,3 @@
-import random
 import sys
 import time
 import uuid
@@ -6,24 +5,21 @@ import uuid
 from client import Sendonly
 
 
-def test_random_signaling_message(setup):
+def test_signaling_message(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()}"
 
-    selected_audio = random.choice([True, False])
-    selected_video = random.choice([True, False])
-
     sendonly = Sendonly(
         signaling_urls,
         channel_id,
-        audio=selected_audio,
-        video=selected_video,
+        audio=True,
+        video=True,
         metadata=metadata,
     )
-    sendonly.connect(fake_audio=selected_audio, fake_video=selected_video)
+    sendonly.connect(fake_audio=True, fake_video=True)
 
     time.sleep(5)
 
@@ -34,7 +30,7 @@ def test_random_signaling_message(setup):
     assert sendonly.answer_message is not None
 
     assert sendonly.connect_message["role"] == "sendonly"
-    assert sendonly.connect_message["channel_id"] is channel_id
-    assert sendonly.connect_message["audio"] is selected_audio
-    assert sendonly.connect_message["video"] is selected_video
+    assert sendonly.connect_message["channel_id"] == channel_id
+    assert sendonly.connect_message["audio"] is True
+    assert sendonly.connect_message["video"] is True
     assert sendonly.connect_message["metadata"] == metadata

{sora_sdk-2024.4.0.dev4 → sora_sdk-2024.4.0.dev5}/tests/test_simulcast.py

@@ -6,19 +6,15 @@ import pytest
 from client import Sendonly
 
 
-@pytest.fixture(
-    params=[
+@pytest.mark.parametrize(
+    ("video_codec_type", "expected_implementation"),
+    [
         ("VP8", "SimulcastEncoderAdapter (libvpx, libvpx, libvpx)"),
         ("VP9", "SimulcastEncoderAdapter (libvpx, libvpx, libvpx)"),
         ("AV1", "SimulcastEncoderAdapter (libaom, libaom, libaom)"),
-    ]
+    ],
 )
-def video_codec_params(request):
-    return request.param
-
-
-def test_simulcast(setup, video_codec_params):
-    video_codec, expected_implementation = video_codec_params
+def test_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")
@@ -31,7 +27,7 @@ def test_simulcast(setup, video_codec_params):
         simulcast=True,
         audio=False,
         video=True,
-        video_codec_type=video_codec,
+        video_codec_type=video_codec_type,
         video_bit_rate=3000,
         metadata=metadata,
         video_width=1280,
@@ -52,7 +48,7 @@ def test_simulcast(setup, video_codec_params):
 
     # 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}"
+    assert sendonly_codec_stats["mimeType"] == f"video/{video_codec_type}"
 
     # 複数のoutbound-rtp統計情報を取得
     outbound_rtp_stats = [