Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/prepare-linux/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
# tools/clang/scripts/update.py of the webrtc.branch set in
# webrtc-jni/pom.xml. Update it whenever that branch changes.
- name: Select the Chromium Clang package
run: echo "CLANG_PACKAGE=clang-llvmorg-23-init-19482-g53d18800-1.tar.xz" >> "$GITHUB_ENV"
run: echo "CLANG_PACKAGE=clang-llvmorg-24-init-7747-g62397f8b-27.tar.xz" >> "$GITHUB_ENV"
shell: bash

- name: Cache the Chromium Clang package
Expand Down
21 changes: 21 additions & 0 deletions .github/actions/prepare-windows/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,27 @@ runs:
python -m pip install meson
shell: powershell

# The Windows toolchain of the WebRTC branch set in webrtc-jni/pom.xml
# only accepts the SDK pinned by SDK_VERSION in build/vs_toolchain.py of
# that branch, and gn fails without it. Update it whenever that changes.
- name: Install the Windows SDK
run: |
$version = "10.0.28000.0"
if (-not (Test-Path "${env:ProgramFiles(x86)}\Windows Kits\10\Include\$version\um")) {
$installer = "$env:RUNNER_TEMP\winsdksetup.exe"
Invoke-WebRequest -Uri "https://download.microsoft.com/download/06fc99ac-527e-451e-a536-8866695a2e7e/KIT_BUNDLE_WINDOWSSDK_MEDIACREATION/winsdksetup.exe" -OutFile $installer
if ((Get-FileHash $installer -Algorithm SHA256).Hash -ne "02988EA51EAB2A2DB53E19735E51C97A6D221ADA74B9174FA0868870B9403BA0") {
throw "The Windows SDK installer does not match its checksum"
}
# The x64 and ARM64 libraries for both targets, and the debugging
# tools for dbghelp.dll, which the toolchain setup requires.
$process = Start-Process -FilePath $installer -Wait -PassThru -ArgumentList "/features OptionId.DesktopCPPx64 OptionId.DesktopCPParm64 OptionId.WindowsDesktopDebuggers /quiet /norestart /ceip off"
if ($process.ExitCode -ne 0) {
throw "The Windows SDK installer failed with exit code $($process.ExitCode)"
}
}
shell: powershell

- name: Install MSYS2 and the FFmpeg build tools
run: |
# FFmpeg's configure and makefiles are shell scripts, so building it
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ On the first run, the WebRTC source tree will be loaded into the `/<user home>/w

| Parameter | Description | Default Value |
| ------------------ | ------------------------------------------------------ |-----------------------------|
| webrtc.branch | The WebRTC branch to checkout. | branch-heads/7977 |
| webrtc.branch | The WebRTC branch to checkout. | branch-heads/8059 |
| webrtc.src.dir | The absolute checkout path for the WebRTC source tree. | /\<user_home\>/webrtc |
| webrtc.install.dir | The install path for the compiled WebRTC library. Is also used to link against a pre-compiled WebRTC library to reduce build time. | /\<user_home\>/webrtc/build |

Expand Down
2 changes: 1 addition & 1 deletion webrtc-jni/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>pom</packaging>

<properties>
<webrtc.branch>branch-heads/7977</webrtc.branch>
<webrtc.branch>branch-heads/8059</webrtc.branch>
<webrtc.src.dir>${user.home}/webrtc</webrtc.src.dir>
<webrtc.install.dir>${user.home}/webrtc/build</webrtc.install.dir>
<cmake.build.type>Release</cmake.build.type>
Expand Down
5 changes: 3 additions & 2 deletions webrtc-jni/src/main/cpp/src/JNI_PeerConnectionFactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,9 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_initialize
// send stream.
auto proxy = jni::ProxyAudioDeviceModule::Create(adm);

// The worker thread is left to the factory, which creates and owns one
// when PeerConnectionFactoryDependencies::worker_thread is not set.
// No worker thread is supplied: WebRTC is removing support for one that
// is distinct from the network thread, and without one the factory
// uses the network thread as its worker thread.
webrtc::PeerConnectionFactoryDependencies dependencies;
dependencies.network_thread = networkThread.get();
dependencies.signaling_thread = signalingThread.get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include <sys/ioctl.h>
#include <unistd.h>

#include <system_error>

#define UDEV_SUBSYSTEM "video4linux"
#define UDEV_ADD "add"
#define UDEV_REMOVE "remove"
Expand Down
Loading