fix h264 decoder by adding ffmpeg_branding (#239)

livekit · Nov 13, 2023 · a26ddbd · a26ddbd
1 parent 36d7690
commit a26ddbd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/webrtc-builds.yml b/.github/workflows/webrtc-builds.yml
@@ -108,6 +108,9 @@ jobs:
         with:
           submodules: true
 
+      - uses: actions/setup-python@v4
+      - run: pip3 install setuptools # pkg_resources is sometimes not found?
+
       - name: Install linux dependencies
         if: ${{ matrix.target.os == 'ubuntu-20.04' || matrix.target.os == 'ubuntu-latest' }}
         run: |
@@ -118,13 +121,12 @@ jobs:
         if: ${{ matrix.target.os == 'macos-latest' }}
         run: brew install ninja
 
-      # It doesn't seem to be used?
       - name: Install windows dependencies
         if: ${{ matrix.target.os == 'windows-latest' }}
         run: |
           Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/latest/download/ninja-win.zip" -OutFile ninja.zip
-          Expand-Archive -Path ninja.zip -DestinationPath ninja
-          echo "${{ github.workspace }}\ninja" >> $GITHUB_PATH
+          Expand-Archive -Path ninja.zip -DestinationPath ${{ github.workspace }}\ninja
+          echo "${{ github.workspace }}\ninja" | Out-File -Append -Encoding utf8 -FilePath $Env:GITHUB_PATH
 
       - name: Print ninja version
         run: ninja --version

diff --git a/webrtc-sys/libwebrtc/build_linux.sh b/webrtc-sys/libwebrtc/build_linux.sh
@@ -94,6 +94,7 @@ args="is_debug=$debug  \
   is_component_build=false \
   enable_stripping=true \
   use_goma=false \
+  ffmpeg_branding=\"Chrome\" \
   rtc_use_h264=true \
   rtc_use_pipewire=false \
   symbol_level=0 \

diff --git a/webrtc-sys/libwebrtc/build_windows.cmd b/webrtc-sys/libwebrtc/build_windows.cmd
@@ -65,7 +65,7 @@ if "!profile!" == "debug" (
 
 rem generate ninja for release
 call gn.bat gen %OUTPUT_DIR% --root="src" ^
-  --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true symbol_level=0 enable_iterator_debugging=false"
+  --args="is_debug=!debug! is_clang=true target_cpu=\"!arch!\" use_custom_libcxx=false rtc_include_tests=false rtc_build_examples=false rtc_build_tools=false is_component_build=false rtc_enable_protobuf=false rtc_use_h264=true ffmpeg_branding=\"Chrome\" symbol_level=0 enable_iterator_debugging=false"
 
 rem build
 ninja.exe -C %OUTPUT_DIR% :default