Merge branch 'develop' into feature/e2e-test

.github/workflows/build.yml

@@ -45,10 +45,10 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - name: ubuntu-24.04_x86_64
-            target: ubuntu-24.04_x86_64
-            runs_on: ubuntu-24.04
-            os: ubuntu
+          # - name: ubuntu-24.04_x86_64
+          #   target: ubuntu-24.04_x86_64
+          #   runs_on: ubuntu-24.04
+          #   os: ubuntu
           - name: ubuntu-22.04_x86_64
             target: ubuntu-22.04_x86_64
             runs_on: ubuntu-22.04
@@ -204,7 +204,7 @@ jobs:
           fi
       # matrix の中で１個だけソースディストリビューション用のデータを残しておく
       - run: mv *.tar.gz dist/
-        if: ${{ matrix.platform.name == 'macos-13_arm64' && matrix.python_version == '3.10' }}
+        if: ${{ matrix.platform.name == 'macos-14_arm64' && matrix.python_version == '3.10' }}
 
       # テスト用
       # - name: Publish package to TestPyPI
@@ -237,12 +237,6 @@ jobs:
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/download
-        with: { "platform": "ubuntu-24.04_x86_64", "python_version": "3.10" }
-      - uses: ./.github/actions/download
-        with: { "platform": "ubuntu-24.04_x86_64", "python_version": "3.11" }
-      - uses: ./.github/actions/download
-        with: { "platform": "ubuntu-24.04_x86_64", "python_version": "3.12" }
       - uses: ./.github/actions/download
         with: { "platform": "ubuntu-22.04_x86_64", "python_version": "3.10" }
       - uses: ./.github/actions/download

README.md

@@ -31,7 +31,7 @@ Please read <https://github.com/shiguredo/oss/blob/master/README.en.md> before u
   - Intel VPL (AV1 / H.264 / H.265)
   - Apple Video Toolbox (H.264 / H.265)
   - NVIDIA Video Codec SDK (VP9 / H.264 / H.265)
-  - NVIDIA Jetson JetPack SDK (H.264 / H.265 / AV1)
+  - NVIDIA Jetson JetPack SDK (AV1 / H.264 / H.265)
 - [OpenH264](https://github.com/cisco/openh264) を利用した H.264 のソフトウェアエンコーダー/デコーダーに対応
 - 物体検出などの入力に Sora 経由で受信した映像が利用できる
 - 音声認識などの入力に Sora 経由で受信した音声を利用できる
@@ -81,23 +81,14 @@ PyPI 経由ではインストールできません。
 
 ## 対応プラットフォーム
 
-- Windows 11 x86_64 以降
-- macOS 14 arm64 以降
-- Ubuntu 24.04 x86_64
-- Ubuntu 22.04 x86_64
-- Ubuntu 22.04 arm64 (NVIDIA Jetson JetPack SDK 6)
-  - Python 3.10 のみ対応
-  - NVIDIA Jetson JetPack SDK 6
-
-### Ubuntu LTS への対応
-
-最新の 2 バージョンのみをサポートします。
-それよりの過去の Ubuntu に付いては優先実装で対応できますので、ご相談ください。
-
-- Ubuntu 24.04 LTS
-  - Ubuntu 28.04 リリース後、6 ヶ月以内に通常サポート終了
-- Ubuntu 22.04 LTS
-  - Ubuntu 26.04 リリース後、6 ヶ月以内に通常サポート終了
+- Windows 11 x86_64
+- Windows Server 2022 x86_64
+- macOS Sonoma 13 arm64
+- macOS Ventura 14 arm64
+- Ubuntu 24.04 LTS x86_64
+- Ubuntu 22.04 LTS x86_64
+- Ubuntu 22.04 LTS arm64 (NVIDIA Jetson JetPack SDK 6)
+  - PyPI からではなくパッケージファイルを利用してください
 
 ## 対応機能
 

examples/.python-version

@@ -1 +1 @@
-3.9.19
+3.10.13

examples/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "sora-sdk-samples"
-version = "2024.3.0.dev8"
+version = "2024.3.0.dev9"
 description = "Sora Python SDK Samples"
 authors = [{ name = "Shiguredo Inc." }]
 dependencies = [
     "opencv-python~=4.10.0.84",
     "opencv-python-headless~=4.10.0.84",
     "sounddevice~=0.4.7",
-    "sora-sdk>=2024.3.0.dev8",
+    "sora-sdk>=2024.3.0.dev9",
     "mediapipe~=0.10.14",
     "python-dotenv>=1.0.1",
 ]

examples/requirements-dev.lock

@@ -20,42 +20,26 @@ contourpy==1.1.0
     # via matplotlib
 cycler==0.11.0
     # via matplotlib
-filelock==3.15.4
-    # via torch
 flatbuffers==23.5.26
     # via mediapipe
 fonttools==4.40.0
     # via matplotlib
-fsspec==2024.6.1
-    # via torch
-importlib-metadata==8.0.0
-    # via jax
-importlib-resources==5.12.0
-    # via matplotlib
 jax==0.4.13
     # via mediapipe
 jaxlib==0.4.13
     # via mediapipe
-jinja2==3.1.4
-    # via torch
 kiwisolver==1.4.4
     # via matplotlib
-markupsafe==2.1.5
-    # via jinja2
 matplotlib==3.7.2
     # via mediapipe
-mediapipe==0.10.11
+mediapipe==0.10.14
     # via sora-sdk-samples
 ml-dtypes==0.2.0
     # via jax
     # via jaxlib
-mpmath==1.3.0
-    # via sympy
 mypy==1.10.1
 mypy-extensions==1.0.0
     # via mypy
-networkx==3.1
-    # via torch
 numpy==1.24.4
     # via contourpy
     # via jax
@@ -80,7 +64,7 @@ packaging==23.1
     # via matplotlib
 pillow==10.0.0
     # via matplotlib
-protobuf==3.20.3
+protobuf==4.25.4
     # via mediapipe
 pycparser==2.21
     # via cffi
@@ -96,20 +80,12 @@ scipy==1.10.1
     # via jaxlib
 six==1.16.0
     # via python-dateutil
-sora-sdk==2024.3.0.dev5
+sora-sdk==2024.3.0.dev9
     # via sora-sdk-samples
 sounddevice==0.4.7
     # via mediapipe
     # via sora-sdk-samples
-sympy==1.13.0
-    # via torch
 tomli==2.0.1
     # via mypy
-torch==2.3.1
-    # via mediapipe
 typing-extensions==4.10.0
     # via mypy
-    # via torch
-zipp==3.17.0
-    # via importlib-metadata
-    # via importlib-resources

examples/requirements.lock

@@ -20,39 +20,23 @@ contourpy==1.1.0
     # via matplotlib
 cycler==0.11.0
     # via matplotlib
-filelock==3.15.4
-    # via torch
 flatbuffers==23.5.26
     # via mediapipe
 fonttools==4.40.0
     # via matplotlib
-fsspec==2024.6.1
-    # via torch
-importlib-metadata==8.0.0
-    # via jax
-importlib-resources==5.12.0
-    # via matplotlib
 jax==0.4.13
     # via mediapipe
 jaxlib==0.4.13
     # via mediapipe
-jinja2==3.1.4
-    # via torch
 kiwisolver==1.4.4
     # via matplotlib
-markupsafe==2.1.5
-    # via jinja2
 matplotlib==3.7.2
     # via mediapipe
-mediapipe==0.10.11
+mediapipe==0.10.14
     # via sora-sdk-samples
 ml-dtypes==0.2.0
     # via jax
     # via jaxlib
-mpmath==1.3.0
-    # via sympy
-networkx==3.1
-    # via torch
 numpy==1.24.4
     # via contourpy
     # via jax
@@ -77,7 +61,7 @@ packaging==23.1
     # via matplotlib
 pillow==10.0.0
     # via matplotlib
-protobuf==3.20.3
+protobuf==4.25.4
     # via mediapipe
 pycparser==2.21
     # via cffi
@@ -92,17 +76,8 @@ scipy==1.10.1
     # via jaxlib
 six==1.16.0
     # via python-dateutil
-sora-sdk==2024.3.0.dev5
+sora-sdk==2024.3.0.dev9
     # via sora-sdk-samples
 sounddevice==0.4.7
     # via mediapipe
     # via sora-sdk-samples
-sympy==1.13.0
-    # via torch
-torch==2.3.1
-    # via mediapipe
-typing-extensions==4.12.2
-    # via torch
-zipp==3.17.0
-    # via importlib-metadata
-    # via importlib-resources

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sora_sdk"
 authors = [{ name = "Shiguredo Inc.", email = "[email protected]" }]
-version = "2024.3.0.dev8"
+version = "2024.3.0.dev9"
 description = "WebRTC SFU Sora Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }