Skip to content

feat: add noise cancellation apis #12

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.

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ android {
}

dependencies {
api 'io.github.webrtc-sdk:android:125.6422.06.1'
api 'io.getstream:stream-webrtc-android:1.3.8'
implementation 'com.facebook.react:react-native:+'
implementation "androidx.core:core:1.7.0"
}
9 changes: 9 additions & 0 deletions android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
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.H264AndSoftwareVideoDecoderFactory;
import com.oney.WebRTCModule.webrtcutils.H264AndSoftwareVideoEncoderFactory;

Expand Down Expand Up @@ -64,6 +66,8 @@ 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;

PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(reactContext)
Expand Down Expand Up @@ -96,10 +100,15 @@ public WebRTCModule(ReactApplicationContext reactContext) {
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();
}

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

// PeerConnectionFactory now owns the adm native pointer, and we don't need it anymore.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.oney.WebRTCModule;

import com.oney.WebRTCModule.audio.AudioProcessingFactoryProvider;

import org.webrtc.Loggable;
import org.webrtc.Logging;
import org.webrtc.VideoDecoderFactory;
Expand All @@ -16,6 +18,7 @@ public class WebRTCModuleOptions {
public Logging.Severity loggingSeverity;
public String fieldTrials;
public boolean enableMediaProjectionService;
public AudioProcessingFactoryProvider audioProcessingFactoryProvider;

public static WebRTCModuleOptions getInstance() {
if (instance == null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.oney.WebRTCModule.audio;

import org.webrtc.ExternalAudioProcessingFactory;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;

public class AudioProcessingAdapter implements ExternalAudioProcessingFactory.AudioProcessing {
public interface ExternalAudioFrameProcessing {
void initialize(int sampleRateHz, int numChannels);

void reset(int newRate);

void process(int numBands, int numFrames, ByteBuffer buffer);
}

public AudioProcessingAdapter() {}
List<ExternalAudioFrameProcessing> audioProcessors = new ArrayList<>();

public void addProcessor(ExternalAudioFrameProcessing audioProcessor) {
synchronized (audioProcessors) {
audioProcessors.add(audioProcessor);
}
}

public void removeProcessor(ExternalAudioFrameProcessing audioProcessor) {
synchronized (audioProcessors) {
audioProcessors.remove(audioProcessor);
}
}

@Override
public void initialize(int sampleRateHz, int numChannels) {
synchronized (audioProcessors) {
for (ExternalAudioFrameProcessing audioProcessor : audioProcessors) {
audioProcessor.initialize(sampleRateHz, numChannels);
}
}
}

@Override
public void reset(int newRate) {
synchronized (audioProcessors) {
for (ExternalAudioFrameProcessing audioProcessor : audioProcessors) {
audioProcessor.reset(newRate);
}
}
}

@Override
public void process(int numBands, int numFrames, ByteBuffer buffer) {
synchronized (audioProcessors) {
for (ExternalAudioFrameProcessing audioProcessor : audioProcessors) {
audioProcessor.process(numBands, numFrames, buffer);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.oney.WebRTCModule.audio;

import org.webrtc.AudioProcessingFactory;
import org.webrtc.ExternalAudioProcessingFactory;

public class AudioProcessingController implements AudioProcessingFactoryProvider {
/**
* This is the audio processing module that will be applied to the audio stream after it is captured from the microphone.
* This is useful for adding echo cancellation, noise suppression, etc.
*/
public final AudioProcessingAdapter capturePostProcessing = new AudioProcessingAdapter();
/**
* This is the audio processing module that will be applied to the audio stream before it is rendered to the speaker.
*/
public final AudioProcessingAdapter renderPreProcessing = new AudioProcessingAdapter();

public ExternalAudioProcessingFactory externalAudioProcessingFactory;

public AudioProcessingController() {
this.externalAudioProcessingFactory = new ExternalAudioProcessingFactory();
this.externalAudioProcessingFactory.setCapturePostProcessing(capturePostProcessing);
this.externalAudioProcessingFactory.setRenderPreProcessing(renderPreProcessing);
}

@Override
public AudioProcessingFactory getFactory() {
return this.externalAudioProcessingFactory;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.oney.WebRTCModule.audio;

import org.webrtc.AudioProcessingFactory;

// Define the common interface
public interface AudioProcessingFactoryProvider {
AudioProcessingFactory getFactory();
}
19 changes: 16 additions & 3 deletions ios/RCTWebRTC/WebRTCModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ - (instancetype)init {
id<RTCAudioDevice> audioDevice = options.audioDevice;
id<RTCVideoDecoderFactory> decoderFactory = options.videoDecoderFactory;
id<RTCVideoEncoderFactory> encoderFactory = options.videoEncoderFactory;
id<RTCAudioProcessingModule> audioProcessingModule = options.audioProcessingModule;
NSDictionary *fieldTrials = options.fieldTrials;
RTCLoggingSeverity loggingSeverity = options.loggingSeverity;

Expand All @@ -69,9 +70,21 @@ - (instancetype)init {
RCTLogInfo(@"Using video encoder factory: %@", NSStringFromClass([encoderFactory class]));
RCTLogInfo(@"Using video decoder factory: %@", NSStringFromClass([decoderFactory class]));

_peerConnectionFactory = [[RTCPeerConnectionFactory alloc] initWithEncoderFactory:encoderFactory
decoderFactory:decoderFactory
audioDevice:audioDevice];
if (audioProcessingModule != nil) {
if (audioDevice != nil) {
NSLog(@"Both audioProcessingModule and audioDevice are provided, but only one can be used. Ignoring audioDevice.");
}
RCTLogInfo(@"Using audio processing module: %@", NSStringFromClass([audioProcessingModule class]));
_peerConnectionFactory = [[RTCPeerConnectionFactory alloc] initWithBypassVoiceProcessing:NO
encoderFactory:encoderFactory
decoderFactory:decoderFactory
audioProcessingModule:audioProcessingModule];
} else {
RCTLogInfo(@"Using audio device: %@", NSStringFromClass([audioDevice class]));
_peerConnectionFactory = [[RTCPeerConnectionFactory alloc] initWithEncoderFactory:encoderFactory
decoderFactory:decoderFactory
audioDevice:audioDevice];
}

_peerConnections = [NSMutableDictionary new];
_localStreams = [NSMutableDictionary new];
Expand Down
1 change: 1 addition & 0 deletions ios/RCTWebRTC/WebRTCModuleOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, strong, nullable) id<RTCVideoDecoderFactory> videoDecoderFactory;
@property(nonatomic, strong, nullable) id<RTCVideoEncoderFactory> videoEncoderFactory;
@property(nonatomic, strong, nullable) id<RTCAudioDevice> audioDevice;
@property(nonatomic, strong, nullable) id<RTCAudioProcessingModule> audioProcessingModule;
@property(nonatomic, strong, nullable) NSDictionary *fieldTrials;
@property(nonatomic, assign) RTCLoggingSeverity loggingSeverity;
@property(nonatomic, assign) BOOL enableMultitaskingCameraAccess;
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": "125.2.1",
"version": "125.3.0-alpha.4",
"repository": {
"type": "git",
"url": "git+https://github.com/GetStream/react-native-webrtc.git"
Expand Down
Loading