Merge upstream from commit 996c128

Documentation/AndroidInstallation.md

@@ -72,78 +72,6 @@ In `android/app/proguard-rules.pro` add the following on a new line.
 -keep class org.webrtc.** { *; }
 ```
 
-## Screen Capture Support - Android 10+
-
-You'll need [Notifee](https://notifee.app/react-native/docs/overview) or another library that can handle foreground services for you.  
-The basic requirement to get screen capturing working since Android 10 and above is to have a foreground service with `mediaProjection` included as a service type and to have that service running before starting a screen capture session.  
-
-In `android/app/main/AndroidManifest.xml` add the following inside the `<application>` section.  
-
-```xml
-<service
-	android:name="app.notifee.core.ForegroundService"
-	android:foregroundServiceType="mediaProjection|camera|microphone" />
-```
-
-Additionally, add the respective foreground service type permissions before the `<application>` section.
-
-```xml
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
-<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
-```
-
-The following will create an ongoing persistent notification which also comes with a foreground service.  
-You will be prompted for permissions automatically each time you want to initialise screen capturing.  
-A notification channel is also required and created.  
-
-```javascript
-import notifee, { AndroidImportance } from '@notifee/react-native';
-
-try {
-	const channelId = await notifee.createChannel( {
-		id: 'screen_capture',
-		name: 'Screen Capture',
-		lights: false,
-		vibration: false,
-		importance: AndroidImportance.DEFAULT
-	} );
-
-	await notifee.displayNotification( {
-		title: 'Screen Capture',
-		body: 'This notification will be here until you stop capturing.',
-		android: {
-			channelId,
-			asForegroundService: true
-		}
-	} );
-} catch( err ) {
-	// Handle Error
-};
-```
-
-Once screen capturing has finished you should then stop the foreground service.  
-Usually you'd run a notification cancellation function but as the service is involved, instead run the following.  
-
-```javascript
-try {
-	await notifee.stopForegroundService();
-} catch( err ) {
-	// Handle Error
-};
-```
-
-Lastly, you'll need to add this to your project's main `index.js` file.  
-Otherwise, you'll receive errors relating to the foreground service not being registered correctly.  
-
-```javascript
-notifee.registerForegroundService( notification => {
-	return new Promise( () => {
-
-	} );
-} );
-```
-
 ## Fatal Exception: java.lang.UnsatisfiedLinkError
 
 ```

Documentation/BasicUsage.md

@@ -307,8 +307,13 @@ try {
 	// Taken from above, we don't want to flip if we don't have another camera.
 	if ( cameraCount < 2 ) { return; };
 
-	const videoTrack = await localMediaStream.getVideoTracks()[ 0 ];
-	videoTrack._switchCamera();
+	const videoTrack = localMediaStream.getVideoTracks()[0];
+	const constraints = { facingMode: isFrontCam ? 'user' : 'environment' };
+
+	videoTrack.applyConstraints(constraints);
+
+	// _switchCamera is deprecated as of 124.0.5
+	// videoTrack._switchCamera();
 
 	isFrontCam = !isFrontCam;
 } catch( err ) {

Documentation/iOSInstallation.md

@@ -53,6 +53,21 @@ RTCAudioSession.audioSessionDidActivate();
 RTCAudioSession.audioSessionDidDeactivate();
 ```
 
+## Background Camera Access
+
+Background camera access on supported devices can be enabled through setting the `enableMultitaskingCameraAccess` flag on WebRTCModuleOptions. This will require
+the `voip` background mode capability on iOS 18 or later devices.
+
+In your AppDelegate.m file:
+```
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  [WebRTCModuleOptions sharedInstance].enableMultitaskingCameraAccess = YES;
+
+  // ...
+}
+```
+
 ## Library not loaded/Code signature invalid
 
 This is an issue with iOS 13.3.1.  

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

@@ -1,11 +1,18 @@
 package com.oney.WebRTCModule;
 
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+
 import org.webrtc.VideoCapturer;
 
 public abstract class AbstractVideoCaptureController {
-    protected final int targetWidth;
-    protected final int targetHeight;
-    protected final int targetFps;
+    protected int targetWidth;
+    protected int targetHeight;
+    protected int targetFps;
 
     protected int actualWidth;
     protected int actualHeight;
@@ -31,6 +38,9 @@ public void initializeVideoCapturer() {
         videoCapturer = createVideoCapturer();
     }
 
+    @Nullable
+    public abstract String getDeviceId();
+
     public void dispose() {
         if (videoCapturer != null) {
             videoCapturer.dispose();
@@ -50,6 +60,16 @@ public int getFrameRate() {
         return actualFps;
     }
 
+    public WritableMap getSettings() {
+        WritableMap settings = Arguments.createMap();
+        settings.putString("deviceId", getDeviceId());
+        settings.putString("groupId", "");
+        settings.putInt("height", getHeight());
+        settings.putInt("width", getWidth());
+        settings.putInt("frameRate", getFrameRate());
+        return settings;
+    }
+
     public VideoCapturer getVideoCapturer() {
         return videoCapturer;
     }
@@ -73,6 +93,12 @@ public boolean stopCapture() {
         }
     }
 
+    public void applyConstraints(ReadableMap constraints, @Nullable Consumer<Exception> onFinishedCallback) {
+        if (onFinishedCallback != null) {
+            onFinishedCallback.accept(new UnsupportedOperationException("This video track does not support applyConstraints."));
+        }
+    }
+
     public void setCapturerEventsListener(CapturerEventsListener listener) {
         this.capturerEventsListener = listener;
     }