Merge remote-tracking branch 'upstream/master' into dl/upstream_merge_july2025

Author: davidliu

.github/workflows/android_ci.yml

@@ -13,14 +13,14 @@ jobs:
   android-compile:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '17'
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
+        node-version-file: '.nvmrc'
         cache: 'npm'
         cache-dependency-path: '**/package-lock.json'
 

.github/workflows/ci.yml

@@ -7,10 +7,11 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: 16
+        node-version-file: '.nvmrc'
+        cache: 'npm'
     - run: npm install
     - name: Check if the git repository is clean
       run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)

.github/workflows/ios_ci.yml

@@ -13,11 +13,10 @@ jobs:
   ios-compile:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
       with:
-        node-version: '16.x'
+        node-version-file: '.nvmrc'
         cache: 'npm'
         cache-dependency-path: '**/package-lock.json'
 

.nvmrc

@@ -0,0 +1 @@
+22

Documentation/AndroidInstallation.md

@@ -64,12 +64,53 @@ compileOptions {
 }
 ```
 
-## R8/ProGuard Support
+## Set audio category (output) to media
 
-In `android/app/proguard-rules.pro` add the following on a new line.
+The audio is considered calls by default. If you don't want your audio to be treated as a call stream you need to change the category. To set the category:
 
-```proguard
--keep class org.webrtc.** { *; }
+if your Android files are written in Java, modify `MainApplication.java`:
+```java
+// add imports
+import com.oney.WebRTCModule.WebRTCModuleOptions;
+import android.media.AudioAttributes;
+import org.webrtc.audio.JavaAudioDeviceModule;
+
+public class MainApplication extends Application implements ReactApplication {
+	@Override
+	public void onCreate() {
+		// append this before WebRTCModule initializes
+		WebRTCModuleOptions options = WebRTCModuleOptions.getInstance();
+		AudioAttributes audioAttributes = AudioAttributes.Builder()
+		    .setUsage(AudioAttributes.USAGE_MEDIA)
+		    .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+		    .build();
+		options.audioDeviceModule = JavaAudioDeviceModule.builder(this)
+		.setAudioAttributes(audioAttributes)
+		.createAudioDeviceModule();
+	}
+}
+```
+
+if your Android files are written in Kotlin, modify `MainApplication.kt`:
+```kt
+// add imports
+import com.oney.WebRTCModule.WebRTCModuleOptions;
+import android.media.AudioAttributes
+import org.webrtc.audio.JavaAudioDeviceModule;
+
+class MainApplication : Application(), ReactApplication {
+	override fun onCreate() {
+		// append this before WebRTCModule initializes
+		val options = WebRTCModuleOptions.getInstance()
+		val audioAttributes = AudioAttributes.Builder()
+			.setUsage(AudioAttributes.USAGE_MEDIA)
+			.setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+			.build()
+		options.audioDeviceModule = JavaAudioDeviceModule.builder(this)
+			.setAudioAttributes(audioAttributes)
+			.createAudioDeviceModule()
+	}
+}
 ```
 
 ## Fatal Exception: java.lang.UnsatisfiedLinkError

android/build.gradle

@@ -18,6 +18,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 24)
         versionCode 1
         versionName "1.0"
+        consumerProguardFiles 'consumer-rules.pro'
     }
 
     // WebRTC requires Java 8 features
@@ -29,7 +30,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:+'
+    implementation "com.facebook.react:react-android:+"
     api 'io.github.webrtc-sdk:android:125.6422.04'
     implementation "androidx.core:core:1.7.0"
 }

android/consumer-rules.pro

@@ -0,0 +1,2 @@
+# WebRTC
+-keep class org.webrtc.** { *; }

android/src/main/java/com/oney/WebRTCModule/CameraCaptureController.java

@@ -3,6 +3,10 @@
 import android.content.Context;
 import android.hardware.camera2.CameraManager;
 import android.util.Log;
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
 
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
@@ -239,8 +243,8 @@ private void updateActualSize(int cameraIndex, String cameraName, VideoCapturer
      *                   {@code null} and a {@code VideoCapturer} can be created for it, then
      *                   {@code facingMode} is ignored.
      * @param facingMode the facing of the requested video source such as
-     *                   {@code user} and {@code environment}. If {@code null}, "user" is
-     *                   presumed.
+     * {@code user} and {@code environment}. If {@code null}, "user" is
+     * presumed.
      * @return a pair containing the deviceId and {@code VideoCapturer} satisfying the {@code facingMode} or
      * {@code deviceId} constraint, or null.
      */

android/src/main/java/com/oney/WebRTCModule/GetUserMediaImpl.java

@@ -27,8 +27,11 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * The implementation of {@code getUserMedia} extracted into a separate file in
@@ -405,28 +408,35 @@ VideoTrack createVideoTrack(AbstractVideoCaptureController videoCaptureControlle
     }
 
     /**
-     * Set video effect to the TrackPrivate corresponding to the trackId with the help of VideoEffectProcessor
-     * corresponding to the name.
+     * Set video effects to the TrackPrivate corresponding to the trackId with the help of VideoEffectProcessor
+     * corresponding to the names.
      * @param trackId TrackPrivate id
-     * @param name VideoEffectProcessor name
+     * @param names VideoEffectProcessor names
      */
-    void setVideoEffect(String trackId, String name) {
+    void setVideoEffects(String trackId, ReadableArray names) {
         TrackPrivate track = tracks.get(trackId);
 
         if (track != null && track.videoCaptureController instanceof CameraCaptureController) {
             VideoSource videoSource = (VideoSource) track.mediaSource;
             SurfaceTextureHelper surfaceTextureHelper = track.surfaceTextureHelper;
 
-            if (name != null) {
-                VideoFrameProcessor videoFrameProcessor = ProcessorProvider.getProcessor(name);
-
-                if (videoFrameProcessor == null) {
-                    Log.e(TAG, "no videoFrameProcessor associated with this name");
-                    return;
-                }
-
-                VideoEffectProcessor videoEffectProcessor =
-                        new VideoEffectProcessor(videoFrameProcessor, surfaceTextureHelper);
+            if (names != null) {
+                List<VideoFrameProcessor> processors =
+                        names.toArrayList()
+                                .stream()
+                                .filter(name -> name instanceof String)
+                                .map(name -> {
+                                    VideoFrameProcessor videoFrameProcessor =
+                                            ProcessorProvider.getProcessor((String) name);
+                                    if (videoFrameProcessor == null) {
+                                        Log.e(TAG, "no videoFrameProcessor associated with this name: " + name);
+                                    }
+                                    return videoFrameProcessor;
+                                })
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toList());
+
+                VideoEffectProcessor videoEffectProcessor = new VideoEffectProcessor(processors, surfaceTextureHelper);
                 videoSource.setVideoProcessor(videoEffectProcessor);
 
             } else {

android/src/main/java/com/oney/WebRTCModule/WebRTCModule.java

@@ -90,13 +90,11 @@ public WebRTCModule(ReactApplicationContext reactContext) {
         Logging.Severity loggingSeverity = options.loggingSeverity;
         String fieldTrials = options.fieldTrials;
 
-        PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions
-                                                 .builder(reactContext)
-
-                                                 .setFieldTrials(fieldTrials)
-                                                 .setNativeLibraryLoader(new LibraryLoader())
-                                                 .setInjectableLogger(injectableLogger, loggingSeverity)
-                                                 .createInitializationOptions());
+        PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(reactContext)
+                        .setFieldTrials(fieldTrials)
+                        .setNativeLibraryLoader(new LibraryLoader())
+                        .setInjectableLogger(injectableLogger, loggingSeverity)
+                        .createInitializationOptions());
 
         if (injectableLogger == null && loggingSeverity != null) {
             Logging.enableLogToDebugOutput(loggingSeverity);
@@ -749,7 +747,7 @@ public void transceiverSetDirection(int id, String senderId, String direction, P
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
-    public void transceiverSetCodecPreferences(int id, String senderId, ReadableArray codecPreferences) {
+    public boolean transceiverSetCodecPreferences(int id, String senderId, ReadableArray codecPreferences) {
         ThreadUtils.runOnExecutor(() -> {
             WritableMap identifier = Arguments.createMap();
             WritableMap params = Arguments.createMap();
@@ -808,6 +806,7 @@ public void transceiverSetCodecPreferences(int id, String senderId, ReadableArra
                 Log.d(TAG, "transceiverSetCodecPreferences(): " + e.getMessage());
             }
         });
+        return true;
     }
 
     @ReactMethod
@@ -983,8 +982,8 @@ private ReadableArray getTransceiversInfo(PeerConnection peerConnection) {
     }
 
     @ReactMethod
-    public void mediaStreamTrackSetVideoEffect(String id, String name) {
-        ThreadUtils.runOnExecutor(() -> { getUserMediaImpl.setVideoEffect(id, name); });
+    public void mediaStreamTrackSetVideoEffects(String id, ReadableArray names) {
+        ThreadUtils.runOnExecutor(() -> { getUserMediaImpl.setVideoEffects(id, names); });
     }
 
     @ReactMethod