Skip to content
Open
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
32 changes: 21 additions & 11 deletions android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.modules.core.DeviceEventManagerModule;
import com.oney.WebRTCModule.audio.AudioProcessingFactoryProvider;
import com.oney.WebRTCModule.audio.AudioProcessingController;
import com.oney.WebRTCModule.webrtcutils.SelectiveVideoDecoderFactory;

import org.webrtc.*;
Expand Down Expand Up @@ -66,7 +64,6 @@ public WebRTCModule(ReactApplicationContext reactContext) {
VideoDecoderFactory decoderFactory = options.videoDecoderFactory;
Loggable injectableLogger = options.injectableLogger;
Logging.Severity loggingSeverity = options.loggingSeverity;
AudioProcessingFactoryProvider audioProcessingFactoryProvider = options.audioProcessingFactoryProvider;

String fieldTrials = options.fieldTrials;

Expand All @@ -92,19 +89,28 @@ public WebRTCModule(ReactApplicationContext reactContext) {
adm = JavaAudioDeviceModule.builder(reactContext).createAudioDeviceModule();
}

AudioProcessingFactory audioProcessingFactory = null;
try {
if (options.audioProcessingFactoryProvider != null) {
audioProcessingFactory = options.audioProcessingFactoryProvider.getFactory();
}
} catch (Exception e) {
// do nothing.
}

Log.d(TAG, "Using video encoder factory: " + encoderFactory.getClass().getCanonicalName());
Log.d(TAG, "Using video decoder factory: " + decoderFactory.getClass().getCanonicalName());

if(audioProcessingFactoryProvider == null) {
audioProcessingFactoryProvider = new AudioProcessingController();
PeerConnectionFactory.Builder pcFactoryBuilder = PeerConnectionFactory.builder()
.setAudioDeviceModule(adm)
.setVideoEncoderFactory(encoderFactory)
.setVideoDecoderFactory(decoderFactory);

if (audioProcessingFactory != null) {
pcFactoryBuilder.setAudioProcessingFactory(audioProcessingFactory);
}

mFactory = PeerConnectionFactory.builder()
.setAudioDeviceModule(adm)
.setVideoEncoderFactory(encoderFactory)
.setVideoDecoderFactory(decoderFactory)
.setAudioProcessingFactory(audioProcessingFactoryProvider.getFactory())
.createPeerConnectionFactory();
mFactory = pcFactoryBuilder.createPeerConnectionFactory();

// PeerConnectionFactory now owns the adm native pointer, and we don't need it anymore.
adm.release();
Expand All @@ -127,6 +133,10 @@ public AudioDeviceModule getAudioDeviceModule() {
return mAudioDeviceModule;
}

public PeerConnectionObserver getPeerConnectionObserver(int id) {
return mPeerConnectionObservers.get(id);
}

private PeerConnection getPeerConnection(int id) {
PeerConnectionObserver pco = mPeerConnectionObservers.get(id);
return (pco == null) ? null : pco.getPeerConnection();
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stream-io/react-native-webrtc",
"version": "137.0.0",
"version": "137.0.1-alpha.1",
"repository": {
"type": "git",
"url": "git+https://github.com/GetStream/react-native-webrtc.git"
Expand Down
34 changes: 28 additions & 6 deletions src/Permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,39 @@ class Permissions {
*/
_requestPermissionAndroid(perm: Permission) {
return new Promise(resolve => {
let isResolved = false;

// Set a timeout to handle hanging promise (e.g., "Never ask again" case)
const timeout = setTimeout(() => {
if (!isResolved) {
isResolved = true;
resolve(false);
}
}, 5000); // 5 second timeout

PermissionsAndroid.request(perm).then(
granted => resolve(granted === PermissionsAndroid.RESULTS.GRANTED),
() => resolve(false)
granted => {
if (!isResolved) {
clearTimeout(timeout);
isResolved = true;
resolve(granted === PermissionsAndroid.RESULTS.GRANTED);
}
},
() => {
if (!isResolved) {
clearTimeout(timeout);
isResolved = true;
resolve(false);
}
}
);
});
}

/**
* Validates the given permission descriptor.
*/
_validatePermissionDescriptior(permissionDesc) {
_validatePermissionDescriptor(permissionDesc) {
if (typeof permissionDesc !== 'object') {
throw new TypeError('Argument 1 of Permissions.query is not an object.');
}
Expand All @@ -77,7 +99,7 @@ class Permissions {
*/
query(permissionDesc: PermissionDescriptor) {
try {
this._validatePermissionDescriptior(permissionDesc);
this._validatePermissionDescriptor(permissionDesc);
} catch (e) {
return Promise.reject(e);
}
Expand Down Expand Up @@ -107,7 +129,7 @@ class Permissions {
*/
request(permissionDesc: PermissionDescriptor) {
try {
this._validatePermissionDescriptior(permissionDesc);
this._validatePermissionDescriptor(permissionDesc);
} catch (e) {
return Promise.reject(e);
}
Expand All @@ -130,4 +152,4 @@ class Permissions {
}
}

export default new Permissions();
export default new Permissions();
2 changes: 1 addition & 1 deletion src/getUserMedia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@ export default function getUserMedia(constraints: Constraints = {}): Promise<Med
WebRTCModule.getUserMedia(constraints, success, failure);
});
});
}
}