Merge pull request #137 from shiguredo/feature/amd-amf

AMD-AMF 対応

Author: voluntas

.env.template

@@ -2,4 +2,6 @@
 # TEST_CHANNEL_ID_PREFIX=
 # TEST_API_URL=
 # TEST_SECRET_KEY=
+## none, verbose, info, warning, error を指定できます
+# TEST_LIBWEBRTC_LOG=
 # OPENH264_PATH=

.github/workflows/e2e-test-amd-amf.yml

@@ -0,0 +1,82 @@
+name: e2e-test-amd-amf
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - ".github/workflows/e2e-test-amd-amf.yml"
+      - "tests/test_amd_amf.py"
+      # C++ SDK のアップデートしたときテストするため
+      - "VERSION"
+  schedule:
+    # UTC の 01:00 は JST だと 10:00 。
+    # 1-5 で 月曜日から金曜日
+    - cron: "0 1 * * 1-5"
+
+env:
+  TEST_SIGNALING_URLS: ${{ secrets.TEST_SIGNALING_URLS }}
+  TEST_CHANNEL_ID_PREFIX: ${{ secrets.TEST_CHANNEL_ID_PREFIX }}
+  TEST_SECRET_KEY: ${{ secrets.TEST_SECRET_KEY }}
+  TEST_API_URL: ${{ secrets.TEST_API_URL }}
+  AMD_AMF: true
+
+jobs:
+  e2e_test_amf:
+    strategy:
+      fail-fast: true
+      matrix:
+        python_version:
+          # TODO: push 時には 3.13 でテストする、schedule 時には全部でテストする
+          # - "3.11"
+          # - "3.12"
+          - "3.13"
+    runs-on:
+      group: Self
+      labels: [self-hosted, linux, x64, AMD-AMF]
+    timeout-minutes: 10
+    if:
+      ${{
+        contains(github.event.head_commit.message, '[e2e]') ||
+        contains(github.ref, 'feature/e2e-test') ||
+        github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event_name == 'schedule'
+      }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: false
+      - run: |
+          uv python pin ${{ matrix.python_version }}
+          uv sync
+          uv run python run.py ubuntu-24.04_x86_64
+          uv run pytest tests/test_amd_amf.py -v
+
+  # slack_notify_succeeded:
+  #   needs: [e2e_test_ubuntu, e2e_test_macos, e2e_test_windows]
+  #   runs-on: ubuntu-24.04
+  #   if: success()
+  #   steps:
+  #     - name: Slack Notification
+  #       uses: rtCamp/action-slack-notify@v2
+  #       env:
+  #         SLACK_CHANNEL: sora-python-sdk
+  #         SLACK_COLOR: good
+  #         SLACK_TITLE: SUCCEEDED
+  #         SLACK_ICON_EMOJI: ":star-struck:"
+  #         SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
+  slack_notify_failed:
+    needs: [e2e_test_amf]
+    runs-on: ubuntu-24.04
+    if: failure()
+    steps:
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: sora-python-sdk
+          SLACK_COLOR: danger
+          SLACK_TITLE: "FAILED"
+          SLACK_ICON_EMOJI: ":japanese_ogre:"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}  

.github/workflows/e2e-test.yml

@@ -2,19 +2,17 @@ name: e2e-test
 
 on:
   workflow_dispatch:
-  workflow_run:
-    workflows: ["build"]
-    types:
-      - completed
-  # push:
-  #   paths-ignore:
-  #     - "**.md"
-  #     - ".github/workflows/e2e-test-intel-vpl.yml"
-  #     - ".github/workflows/e2e-test-apple-video-toolbox.yml"
-  #     - ".github/workflows/e2e-test-nvidia-video-codec-sdk.yml"
-  #     - "tests/test_intel_vpl.py"
-  #     - "tests/test_apple_video_toolbox.py"
-  #     - "tests/test_nvidia_video_codec_sdk.py"
+  push:
+    paths-ignore:
+      - "**.md"
+      - ".github/workflows/e2e-test-intel-vpl.yml"
+      - ".github/workflows/e2e-test-amd-amf.yml"
+      - ".github/workflows/e2e-test-apple-video-toolbox.yml"
+      - ".github/workflows/e2e-test-nvidia-video-codec-sdk.yml"
+      - "tests/test_intel_vpl.py"
+      - "tests/test_amd_amf.py"
+      - "tests/test_apple_video_toolbox.py"
+      - "tests/test_nvidia_video_codec_sdk.py"
   schedule:
     # UTC の 01:00 は JST だと 10:00 。
     # 1-5 で 月曜日から金曜日
@@ -28,7 +26,7 @@ env:
   OPENH264_VERSION: 2.6.0
 
 jobs:
-  # workflow_run 経由で実行される最小限の E2E テスト
+  # push 経由で実行される最小限の E2E テスト
   e2e_test_minimal:
     strategy:
       fail-fast: false
@@ -41,7 +39,7 @@ jobs:
             openh264_arch: "linux64"
     runs-on: ${{ matrix.platform.runs-on}}
     timeout-minutes: 15
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    if: ${{ github.event_name == 'push' }}
     steps:
       - uses: actions/checkout@v4
       - uses: tailscale/github-action@v3

CHANGES.md

@@ -31,6 +31,8 @@
   - @melpon
 - [ADD] Windows で OpenH264 が利用できるようにする
   - @melpon
+- [ADD] AMD AMF に対応する
+  - @melpon
 - [ADD] `send_message()` を追加する
   - `on_message()` と合わせる
   - `send_data_channel()` のシンタックスシュガー
@@ -126,6 +128,9 @@
   - @voluntas
 - [CHANGE] サンプルアプリの E2E テストを一旦削除する
   - @voluntas
+- [ADD] .env.template に TEST_LIBWEBRTC_LOG を追加する
+  - none, verbose, error, warning, info, のいずれかを指定可能
+  - @voluntas
 - [ADD] Ubuntu 24.04 armv8 向けの E2E テストを追加する
   - @voluntas
 - [ADD] pyjwt を dev-dependencies に追加する
@@ -142,6 +147,8 @@
   - @voluntas
 - [ADD] examples に E2E テストを追加する
   - @voluntas
+- [ADD] AMD AMF の E2E テストを追加する
+  - @voluntas
 - [ADD] Intel VPL の E2E テストを追加する
   - @voluntas
 - [ADD] Intel VPL の E2E テストに AV1 を追加する

VERSION

@@ -1,4 +1,4 @@
-SORA_CPP_SDK_VERSION=2025.2.0-canary.13
+SORA_CPP_SDK_VERSION=2025.2.0-canary.14
 WEBRTC_BUILD_VERSION=m132.6834.5.8
 BOOST_VERSION=1.87.0
 CMAKE_VERSION=3.31.6

src/sora_factory.cpp

@@ -39,6 +39,10 @@ SoraFactory::SoraFactory(
     context_config.video_codec_factory_config.capability_config.cuda_context =
         sora::CudaContext::Create();
   }
+  if (sora::AMFContext::CanCreate()) {
+    context_config.video_codec_factory_config.capability_config.amf_context =
+        sora::AMFContext::Create();
+  }
   context_config.video_codec_factory_config.preference = video_codec_preference;
 
   // Audio デバイスは使わない、 use_audio_device を true にしただけでデバイスを掴んでしまうので常に false

src/sora_sdk_ext.cpp

@@ -579,7 +579,8 @@ NB_MODULE(sora_sdk_ext, m) {
       .value("CISCO_OPENH264", sora::VideoCodecImplementation::kCiscoOpenH264)
       .value("INTEL_VPL", sora::VideoCodecImplementation::kIntelVpl)
       .value("NVIDIA_VIDEO_CODEC_SDK",
-             sora::VideoCodecImplementation::kNvidiaVideoCodecSdk);
+             sora::VideoCodecImplementation::kNvidiaVideoCodecSdk)
+      .value("AMD_AMF", sora::VideoCodecImplementation::kAmdAmf);
 
   nb::enum_<webrtc::VideoCodecType>(m, "SoraVideoCodecType",
                                     nb::is_arithmetic())
@@ -606,7 +607,11 @@ NB_MODULE(sora_sdk_ext, m) {
       .def_ro("vpl_impl_value",
               &sora::VideoCodecCapability::Parameters::vpl_impl_value)
       .def_ro("nvcodec_gpu_device_name",
-              &sora::VideoCodecCapability::Parameters::nvcodec_gpu_device_name);
+              &sora::VideoCodecCapability::Parameters::nvcodec_gpu_device_name)
+      .def_ro("amf_runtime_version",
+              &sora::VideoCodecCapability::Parameters::amf_runtime_version)
+      .def_ro("amf_embedded_version",
+              &sora::VideoCodecCapability::Parameters::amf_embedded_version);
   nb::class_<sora::VideoCodecCapability::Codec>(video_codec_capability, "Codec")
       .def_ro("type", &sora::VideoCodecCapability::Codec::type)
       .def_ro("encoder", &sora::VideoCodecCapability::Codec::encoder)
@@ -623,7 +628,12 @@ NB_MODULE(sora_sdk_ext, m) {
       [](std::optional<std::string> openh264) -> sora::VideoCodecCapability {
         sora::VideoCodecCapabilityConfig config;
         config.openh264_path = openh264;
-        config.cuda_context = sora::CudaContext::Create();
+        if (sora::CudaContext::CanCreate()) {
+          config.cuda_context = sora::CudaContext::Create();
+        }
+        if (sora::AMFContext::CanCreate()) {
+          config.amf_context = sora::AMFContext::Create();
+        }
         return sora::GetVideoCodecCapability(config);
       },
       "openh264"_a = nb::none());

tests/client.py

@@ -1,4 +1,5 @@
 import json
+import os
 import queue
 import threading
 import time
@@ -8,12 +9,14 @@
 
 import numpy
 
+import sora_sdk
 from sora_sdk import (
     Sora,
     SoraAudioSink,
     SoraAudioSource,
     SoraConnection,
     SoraDegradationPreference,
+    SoraLoggingSeverity,
     SoraMediaTrack,
     SoraSignalingDirection,
     SoraSignalingErrorCode,
@@ -89,6 +92,21 @@ def __init__(
         self._video_width: int = video_width
         self._video_height: int = video_height
 
+        if webrtc_log := os.environ.get("TEST_LIBWEBRTC_LOG"):
+            match webrtc_log:
+                case "none":
+                    sora_sdk.enable_libwebrtc_log(SoraLoggingSeverity.NONE)
+                case "verbose":
+                    sora_sdk.enable_libwebrtc_log(SoraLoggingSeverity.VERBOSE)
+                case "info":
+                    sora_sdk.enable_libwebrtc_log(SoraLoggingSeverity.INFO)
+                case "warning":
+                    sora_sdk.enable_libwebrtc_log(SoraLoggingSeverity.WARNING)
+                case "error":
+                    sora_sdk.enable_libwebrtc_log(SoraLoggingSeverity.ERROR)
+                case _:
+                    pass
+
         self._sora: Sora = Sora(
             openh264=openh264_path, video_codec_preference=video_codec_preference
         )