fix: make CustomVideoSource's frame_id_ counter thread-safe - #286
Merged
Merged
Conversation
PushFrame() is callable from any Java thread; incrementing a plain uint16_t there was an unsynchronized read-modify-write, the same class of race just fixed in CustomAudioSource (#285).
SendableMetatype
added a commit
to EduGeyser/webrtc-java
that referenced
this pull request
Sep 25, 2026
Brings in upstream 0.17.0 and 0.18.0 and the fixes after them: JNI reference and thread safety fixes (devopvoid#283), field trials on PeerConnectionFactory (devopvoid#284), CustomAudioSource and CustomVideoSource synchronization (devopvoid#285, devopvoid#286), AudioTrackSource.dispose() (devopvoid#287), device-captured audio kept out of sink-fed senders (devopvoid#289), and Map method IDs taken from the interface (devopvoid#290). Fork-side adaptations: - The audio module proxy and the capture natives are media code: they are compiled out of the data channels variant, and ProxyAudioDeviceModule.cpp is excluded from its source list. - The data channels variant passes the field trials through the factory's Environment, as CreatePeerConnectionFactory does. - The Maven poms stay deleted; upstream's jni-check profile becomes the Gradle property -Pjni-check. - The new tests that need audio or video carry the media tag. - The changelog keeps upstream's 0.17.0 and 0.18.0 sections in date order next to the fork's 0.17.0-sm.1 section.
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
1 participant
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.
Summary
CustomVideoSource::PushFrameis callable from any Java thread via the publicpushFrame()native methodframe_id_(a plainuint16_t) there was an unsynchronized read-modify-write — the same class of race just fixed inCustomAudioSource(fix: synchronize CustomAudioSource's sinks_ against AddSink/RemoveSink #285)frame_id_tostd::atomic<uint16_t>Test plan
mvn -pl webrtc-jni -am install -DskipTests— native build succeedsmvn -pl webrtc test -Dtest=CustomVideoSourceTest,CustomAudioSourceTest— all tests pass