OpenH264 を外に出す

shiguredo · Jan 7, 2025 · a9ba2e3 · a9ba2e3
1 parent 9525a28
commit a9ba2e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -13,6 +13,7 @@ env:
   TEST_SIGNALING_URLS: ${{ secrets.TEST_SIGNALING_URLS }}
   TEST_CHANNEL_ID_PREFIX: ${{ secrets.TEST_CHANNEL_ID_PREFIX }}
   TEST_SECRET_KEY: ${{ secrets.TEST_SECRET_KEY }}
+  OPENH264_VERSION: 2.4.1
 
 jobs:
   e2e_test_ubuntu:
@@ -36,9 +37,9 @@ jobs:
           sudo apt-get -y install libva2 libdrm2 libva-dev libdrm-dev libx11-dev portaudio19-dev
       - name: Download openh264
         run: |
-          curl -LO http://ciscobinary.openh264.org/libopenh264-2.4.1-linux64.7.so.bz2
-          bzip2 -d libopenh264-2.4.1-linux64.7.so.bz2
-          mv libopenh264-2.4.1-linux64.7.so libopenh264.so
+          curl -LO http://ciscobinary.openh264.org/libopenh264-${{ env.OPENH264_VERSION }}-linux64.7.so.bz2
+          bzip2 -d libopenh264-${{ env.OPENH264_VERSION }}-linux64.7.so.bz2
+          mv libopenh264-${{ env.OPENH264_VERSION }}-linux64.7.so libopenh264.so
           echo "OPENH264_PATH=$(pwd)/libopenh264.so" >> $GITHUB_ENV
       - uses: astral-sh/setup-uv@v3
       - run: uv python pin ${{ matrix.python_version }}
@@ -48,7 +49,7 @@ jobs:
   e2e_test_macos:
     strategy:
       matrix:
-        python_version: ["3.10", "3.11", "3.12"]
+        python_version: ["3.10", "3.11", "3.12", "3.13"]
         # macos-13 は test_macos.py が上手くテストが動かないのでスキップ
         os: ["macos-14", "macos-15"]
     runs-on: ${{ matrix.os }}
@@ -63,9 +64,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Download openh264
         run: |
-          curl -LO http://ciscobinary.openh264.org/libopenh264-2.4.1-mac-arm64.dylib.bz2
-          bzip2 -d libopenh264-2.4.1-mac-arm64.dylib.bz2
-          mv libopenh264-2.4.1-mac-arm64.dylib libopenh264.dylib
+          curl -LO http://ciscobinary.openh264.org/libopenh264-${{ env.OPENH264_VERSION }}-mac-arm64.dylib.bz2
+          bzip2 -d libopenh264-${{ env.OPENH264_VERSION }}-mac-arm64.dylib.bz2
+          mv libopenh264-${{ env.OPENH264_VERSION }}-mac-arm64.dylib libopenh264.dylib
           echo "OPENH264_PATH=$(pwd)/libopenh264.dylib" >> $GITHUB_ENV
       - uses: astral-sh/setup-uv@v3
       - run: uv python pin ${{ matrix.python_version }}
@@ -75,7 +76,7 @@ jobs:
   e2e_test_windows:
     strategy:
       matrix:
-        python_version: ["3.10", "3.11", "3.12"]
+        python_version: ["3.10", "3.11", "3.12", "3.13"]
     runs-on: windows-2022
     timeout-minutes: 15
     env:
@@ -92,10 +93,10 @@ jobs:
       - name: Download openh264
         shell: pwsh
         run: |
-          $url = "http://ciscobinary.openh264.org/openh264-2.4.1-win64.dll.bz2"
-          Invoke-WebRequest -Uri $url -OutFile "openh264-2.4.1-win64.dll.bz2"
-          7z e openh264-2.4.1-win64.dll.bz2
-          Rename-Item -Path "openh264-2.4.1-win64.dll" -NewName "libopenh264.dll"
+          $url = "http://ciscobinary.openh264.org/openh264-${{ env.OPENH264_VERSION }}-win64.dll.bz2"
+          Invoke-WebRequest -Uri $url -OutFile "openh264-${{ env.OPENH264_VERSION }}-win64.dll.bz2"
+          7z e openh264-${{ env.OPENH264_VERSION }}-win64.dll.bz2
+          Rename-Item -Path "openh264-${{ env.OPENH264_VERSION }}-win64.dll" -NewName "libopenh264.dll"
           echo "OPENH264_PATH=$PWD\libopenh264.dll" >> $env:GITHUB_ENV
       - uses: astral-sh/setup-uv@v3
       - run: uv python pin ${{ matrix.python_version }}

diff --git a/CHANGES.md b/CHANGES.md
@@ -17,5 +17,5 @@
   - @voluntas
 - [CHANGE] E2E テスト成功時に slack 通知をしないようにする
   - @voluntas
-- [CHANGE] E2E テストに Python 3.13 を追加
+- [ADD] E2E テストに Python 3.13 を追加
   - @voluntas