Repository navigation
refactor: let the PeerConnectionFactory own its worker thread - #355
Merged
Merged
Conversation
PeerConnectionFactoryDependencies::worker_thread is being deprecated, so the factory is now created from dependencies filled in directly, with worker_thread left at its default of nullptr. WebRTC then creates and owns the worker thread itself. Device capture is still switched on that thread so it cannot interleave with AudioState starting a recording. ProxyAudioDeviceModule learns the thread when WebRtcVoiceEngine registers its transport, which it does on the worker thread, and switches on the calling thread before that, when no send stream can exist yet.
SendableMetatype
added a commit
to EduGeyser/webrtc-java
that referenced
this pull request
Oct 15, 2026
Brings in the work upstream added from October 11 to 15: hardware video codecs on every platform, through Media Foundation, VideoToolbox, VA-API and NVDEC, with WebRTC built with H.265 (devopvoid#346 to devopvoid#348, devopvoid#352, devopvoid#353, devopvoid#356, devopvoid#359, devopvoid#371 to devopvoid#377); HEVC and AV1 decoding in the media player, with dav1d and Vulkan Video (devopvoid#331, devopvoid#345); encoded frame injectors (devopvoid#365); receiver source changes and audio packet infos (devopvoid#366); audio codec factories (devopvoid#340); network thread observers called on a callback thread (devopvoid#364); screen capture with ScreenCaptureKit (devopvoid#354); Windows audio devices that mix more than two channels (devopvoid#358); autoninja (devopvoid#357); and the release channels of the docs site (devopvoid#361). Fork-side adaptations: - The factory keeps the CreatePeerConnectionFactory overload without a worker thread, and still switches device capture on the network thread. devopvoid#355 copies WebRTC's factory setup and has the audio module learn a worker thread, which only matters for a worker thread distinct from the network thread, and WebRTC is removing those. The audio codec factories and hardware codec switches of devopvoid#340 and devopvoid#359 go to that overload. - WebRTC stays on a commit on main, so the move to branch 8059 (devopvoid#360) and its fixed clang package are left out. - The data channels variant builds WebRTC without H.265 and without the extra targets, leaves out the audio codec factory bindings and addTransceiverOfType, and skips the new tests that need audio or video. - dav1d is built against the sysroot on native Linux builds as well, as FFmpeg is. CI installs Meson for the full variant only, checks out the dav1d submodule, and adds its commit to the FFmpeg cache key. The fork's Windows SDK step stays, without upstream's second one. - The release workflow records the docs' version in the tagged commit, as upstream's now does. The docs site still builds from main, since this fork publishes none. - The Maven files stay deleted: Jetty is bumped in the version catalog, and the docs lockfile takes upstream's bumps on top of the fork's newer VitePress. - The media module's README builds with Gradle.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PeerConnectionFactoryDependencies::worker_threadis being deprecated, so it is now left default-initialized tonullptrand WebRTC creates and owns the factory's worker thread.Changes
JNI_PeerConnectionFactory.cpp):PeerConnectionFactoryDependenciesis filled in directly, mirroringwebrtc::CreatePeerConnectionFactory(), but without ever assigningworker_thread. That helper takes a worker thread as a parameter, so it is the part likely to change with the deprecation. The network and signaling threads are still ours.workerThreadHandlefield inPeerConnectionFactory, and its shutdown indispose().ProxyAudioDeviceModule):setDeviceCaptureEnabledused our worker thread handle to switch capture without interleaving withAudioStatestarting a recording. The proxy now learns the factory's own worker thread inRegisterAudioCallback, whichWebRtcVoiceEnginecalls on that thread, and makes the switch there. Before the transport is registered no send stream can exist, so the switch is made on the calling thread.Tests
PeerConnectionFactoryTests.deviceAudioSourceAfterPeerConnection: device capture is enabled after a peer connection has started the media engine, so the switch goes through the factory-owned worker thread.mvn -pl webrtc-jni,webrtc packageon windows-x86_64: 283 tests, 0 failures, 3 skipped.PeerConnectionFactoryTests,AudioTrackTestsandRTCPeerConnectionTestsunder-Pjni-check: 56 tests pass, no JNI errors.