Skip to content

fix: Check null before use objects and add runOnExecutor #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmorau merged 2 commits into from
Apr 28, 2026
Merged

fix: Check null before use objects and add runOnExecutor #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b11282
fix: Check null before use objects and add runOnExecutor
iosDeveloperDenis Apr 15, 2026
480ec17
fix: Comments
iosDeveloperDenis Apr 15, 2026
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
16 changes: 14 additions & 2 deletions android/src/main/java/com/oney/WebRTCModule/PeerConnectionObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,24 @@ void setPeerConnection(PeerConnection peerConnection) {
void close() {
Log.d(TAG, "PeerConnection.close() for " + id);

peerConnection.close();
PeerConnection pc = peerConnection;
if (pc == null) {
return;
}

pc.close();
}

void dispose() {
Log.d(TAG, "PeerConnection.dispose() for " + id);

PeerConnection pc = peerConnection;
if (pc == null) {
return;
}
// Make future calls observe disposal immediately.
peerConnection = null;

// Remove video track adapters
for (MediaStreamTrack track : this.remoteTracks.values()) {
if (track instanceof VideoTrack) {
Expand All @@ -91,7 +103,7 @@ void dispose() {
// At this point there should be no local MediaStreams in the associated
// PeerConnection. Call dispose() to free all remaining resources held
// by the PeerConnection instance (RtpReceivers, RtpSenders, etc.)
peerConnection.dispose();
pc.dispose();

remoteStreamIds.clear();
remoteStreams.clear();
Expand Down
167 changes: 111 additions & 56 deletions android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import java.util.TimerTask;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

interface OnValueChangeListener {
void onValueChanged(PeerConnectionObserver peerConnection, boolean isSpeaking, double audioLevel);
Expand Down Expand Up @@ -101,6 +104,10 @@ public class WebRTCModule extends ReactContextBaseJavaModule {
AudioLevelValueHolder incomingAudioLevelHolder;
AudioLevelValueHolder outgoingAudioLevelHolder;

private final AtomicInteger voicePollGeneration = new AtomicInteger(0);
private final AtomicReference<Future<?>> voicePollTaskRef = new AtomicReference<>(null);


private final GetUserMediaImpl getUserMediaImpl;

public WebRTCModule(ReactApplicationContext reactContext) {
Expand Down Expand Up @@ -499,6 +506,14 @@ public boolean peerConnectionInit(ReadableMap configuration, int id) {
}

void cancelVoiceActivity() {
// Invalidate all queued/running poll tasks from previous timer cycle.
voicePollGeneration.incrementAndGet();

Future<?> pending = voicePollTaskRef.getAndSet(null);
if (pending != null) {
pending.cancel(false);
}

if (WebRTCModule.voiceTimer != null) {
WebRTCModule.voiceTimer.cancel();
WebRTCModule.voiceTimer.purge();
Expand All @@ -509,6 +524,7 @@ void cancelVoiceActivity() {
outgoingAudioLevelHolder.cleanup();
}


void observeVoiceActivity() {
int checkInterval = 300;

Expand All @@ -518,85 +534,120 @@ void observeVoiceActivity() {
for (int i = 0; i < mPeerConnectionObservers.size(); i++) {
int key = mPeerConnectionObservers.keyAt(i);
PeerConnectionObserver peer = mPeerConnectionObservers.get(key);
silenceIncomingCount.put(peer.getId(), 0);
if (peer != null) {
silenceIncomingCount.put(peer.getId(), 0);
}
}

cancelVoiceActivity();
final int generation = voicePollGeneration.incrementAndGet();

WebRTCModule.voiceTimer = new Timer();
WebRTCModule.voiceTimer.schedule(new TimerTask() {
@Override
public void run() {
for (int i = 0; i < mPeerConnectionObservers.size(); i++) {
int key = mPeerConnectionObservers.keyAt(i);
PeerConnectionObserver peer = mPeerConnectionObservers.get(key);
int id = peer.getId();

if (peer.getPeerConnection().connectionState() == PeerConnection.PeerConnectionState.CONNECTED) {
peer.getPeerConnection().getStats(new RTCStatsCollectorCallback() {
@Override
public void onStatsDelivered(RTCStatsReport rtcStatsReport) {

for (RTCStats stats : rtcStatsReport.getStatsMap().values()) {
if (stats.getType().equals("inbound-rtp")) {
Object audioLevelObject = stats.getMembers().get("audioLevel");

if (audioLevelObject instanceof Double) {
Double audioLevel = ((Double) audioLevelObject);

if (audioLevel > 0.025) {
silenceIncomingCount.put(id, 0);
incomingAudioLevelHolder.setValue(peer, true, audioLevel.doubleValue());
} else {
silenceIncomingCount.put(id, silenceIncomingCount.get(id) + 1);

if (silenceIncomingCount.get(id) > 4.0) {
incomingAudioLevelHolder.setValue(peer, false, 0);
if (voicePollGeneration.get() != generation) {
return;
}

Future<?> current = voicePollTaskRef.get();
if (current != null && !current.isDone()) {
return; // previous tick still queued/running
}

Future<?> next = ThreadUtils.submitToExecutor(() -> {
if (voicePollGeneration.get() != generation) {
return;
}

for (int i = 0; i < mPeerConnectionObservers.size(); i++) {
int key = mPeerConnectionObservers.keyAt(i);
PeerConnectionObserver peer = mPeerConnectionObservers.get(key);
if (peer == null) {
continue;
}

PeerConnection peerConnection = peer.getPeerConnection();
if (peerConnection == null) {
continue;
}

int id = peer.getId();

if (peerConnection.connectionState() == PeerConnection.PeerConnectionState.CONNECTED) {
Comment thread
iosDeveloperDenis marked this conversation as resolved.
peerConnection.getStats(new RTCStatsCollectorCallback() {
@Override
public void onStatsDelivered(RTCStatsReport rtcStatsReport) {
for (RTCStats stats : rtcStatsReport.getStatsMap().values()) {
if (stats.getType().equals("inbound-rtp")) {
Object audioLevelObject = stats.getMembers().get("audioLevel");

Comment thread
iosDeveloperDenis marked this conversation as resolved.
if (audioLevelObject instanceof Double) {
Double audioLevel = ((Double) audioLevelObject);

if (audioLevel > 0.025) {
silenceIncomingCount.put(id, 0);
incomingAudioLevelHolder.setValue(peer, true, audioLevel.doubleValue());
} else {
silenceIncomingCount.put(id, silenceIncomingCount.get(id) + 1);

if (silenceIncomingCount.get(id) > 4.0) {
incomingAudioLevelHolder.setValue(peer, false, 0);
}
}
}
}
}
}
}
});
});
}
}
}

for (int i = 0; i < mPeerConnectionObservers.size(); i++) {
int key = mPeerConnectionObservers.keyAt(i);
PeerConnectionObserver peer = mPeerConnectionObservers.get(key);

if (peer.getPeerConnection().connectionState() == PeerConnection.PeerConnectionState.CONNECTED) {
peer.getPeerConnection().getStats(new RTCStatsCollectorCallback() {
@Override
public void onStatsDelivered(RTCStatsReport rtcStatsReport) {

for (RTCStats stats : rtcStatsReport.getStatsMap().values()) {
if (stats.getType().equals("media-source")) {
Object audioLevelObject = stats.getMembers().get("audioLevel");

if (audioLevelObject instanceof Double) {
Double audioLevel = ((Double) audioLevelObject);
for (int i = 0; i < mPeerConnectionObservers.size(); i++) {
int key = mPeerConnectionObservers.keyAt(i);
PeerConnectionObserver peer = mPeerConnectionObservers.get(key);
if (peer == null) {
continue;
}

if (audioLevel > 0.01) {
silenceOutgoingCount[0] = 0;
outgoingAudioLevelHolder.setValue(peer, true, audioLevel.doubleValue());
} else {
silenceOutgoingCount[0] += 1;
PeerConnection peerConnection = peer.getPeerConnection();
if (peerConnection == null) {
continue;
}

if (silenceOutgoingCount[0] > 4.0) {
outgoingAudioLevelHolder.setValue(peer, false, 0);
if (peerConnection.connectionState() == PeerConnection.PeerConnectionState.CONNECTED) {
peerConnection.getStats(new RTCStatsCollectorCallback() {
@Override
public void onStatsDelivered(RTCStatsReport rtcStatsReport) {
for (RTCStats stats : rtcStatsReport.getStatsMap().values()) {
if (stats.getType().equals("media-source")) {
Object audioLevelObject = stats.getMembers().get("audioLevel");

if (audioLevelObject instanceof Double) {
Comment thread
iosDeveloperDenis marked this conversation as resolved.
Double audioLevel = ((Double) audioLevelObject);

if (audioLevel > 0.01) {
silenceOutgoingCount[0] = 0;
outgoingAudioLevelHolder.setValue(peer, true, audioLevel.doubleValue());
} else {
silenceOutgoingCount[0] += 1;

if (silenceOutgoingCount[0] > 4.0) {
outgoingAudioLevelHolder.setValue(peer, false, 0);
}
}
}
}
}
}
}
});
});

return;
return;
}
}
}
});

voicePollTaskRef.set(next);
}
}, 0, checkInterval);

Expand Down Expand Up @@ -1542,7 +1593,11 @@ public void peerConnectionDispose(int id) {
if (pco == null || pco.getPeerConnection() == null) {
Comment thread
iosDeveloperDenis marked this conversation as resolved.
Log.d(TAG, "peerConnectionDispose() peerConnection is null");
}
pco.dispose();

if (pco != null) {
pco.dispose();
}

mPeerConnectionObservers.remove(id);

if (mPeerConnectionObservers.size() == 0) {
Expand Down
Loading