Merge branch 'upstream-tag-118.0.3' into main-synced-to-118.0.3

# Conflicts:
#	README.md
#	ios/RCTWebRTC/WebRTCModule+RTCMediaStream.m
#	package-lock.json
#	package.json
#	src/MediaDevices.ts

Author: filipi87

.github/workflows/android_ci.yml

@@ -2,8 +2,12 @@ name: Android CI
 on:
   push:
     branches: [ master ]
+    paths-ignore:
+      - '**.md'
   pull_request:
     branches: [ master ]
+    paths-ignore:
+      - '**.md'
 
 jobs:
   android-compile:
@@ -26,4 +30,4 @@ jobs:
 
     - name: Compile Android Example
       run: ./gradlew assembleDebug
-      working-directory: ./examples/GumTestApp/android
+      working-directory: ./examples/GumTestApp/android

.github/workflows/ios_ci.yml

@@ -2,8 +2,12 @@ name: iOS CI
 on:
   push:
     branches: [ master ]
+    paths-ignore:
+      - '**.md'
   pull_request:
     branches: [ master ]
+    paths-ignore:
+      - '**.md'
 
 jobs:
   ios-compile:

Documentation/AndroidInstallation.md

@@ -4,6 +4,8 @@ Starting with React Native 0.60 due to a new auto linking feature you no longer
 
 See a sample app in the `examples/GumTestApp` directory.  
 
+**IMPORTANT:** Android API level >= 24 are supported.
+
 ## Declaring Permissions
 
 In `android/app/src/main/AndroidManifest.xml` add the following permissions before the `<application>` section.  
@@ -62,6 +64,14 @@ In `android/app/main/AndroidManifest.xml` add the following inside the `<applica
 	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.  
@@ -102,8 +112,8 @@ try {
 };
 ```
 
-Lastly you'll need to add this to your projects main `index.js` file.  
-Otherwise you'll receive errors relating to the foreground service not being registered correctly.  
+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 => {
@@ -169,7 +179,7 @@ java.lang.Thread in run at line 764
 
 From a more specific [similar Error](https://github.com/msgpack/msgpack-java/issues/516) explaining FloatBuffer change in java 8 and in java 11.
 
-We verifying that the jar files in android/libs/ are compiled for JRE11 (Major version 55), 
+We are verifying that the jar files in android/libs/ are compiled for JRE11 (Major version 55), 
 
 We think that the library being compiled against the JRE 11 runtime and osVersion 9 seems to use the Java 8 context where the classByteBuffer inherits the position method from Buffer and has a return type of java.nio.Buffer. 
 (On Java 11 the method is overridden with an implementation that returns java.nio.ByteBuffer.)

Documentation/BasicUsage.md

@@ -1,6 +1,6 @@
 # Basic Usage
 
-For starters we're going to import everything ready to use.  
+For starters, we're going to import everything ready to use.  
 Most of the included functionality is similar to how you would deal with WebRTC in your browser.  
 We support a lot of the official WebRTC APIs, see this [document](https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection) for more details.  
 If you see functions that are listed in the document above but not listed below then they are likely not supported by this module yet and will most likely be supported in the near future, we're open to contributions.
@@ -41,7 +41,7 @@ You can also find a shim for react-native-web over [here](https://github.com/rea
 
 ## Get Available Media Devices
 
-Some devices might not have more than 1 camera. The following will allow you to know how many cameras the device has. You can ofcourse use `enumerateDevices` to list other media device information too.  
+Some devices might not have more than 1 camera. The following will allow you to know how many cameras the device has. You can use `enumerateDevices` to list other media device information too.  
 
 ```javascript
 let cameraCount = 0;
@@ -115,7 +115,7 @@ try {
 ## Destroying the Media Stream
 
 Cycling all of the tracks and stopping them is more than enough to clean up after a call has finished.  
-You won't usually need to do this for remote tracks, only local.  
+You usually won't need to do this for remote tracks, only local.  
 
 ```javascript
 localMediaStream.getTracks().forEach(
@@ -142,7 +142,7 @@ let peerConstraints = {
 
 ## Creating a Peer Connection
 
-Here we're creating a peer connection required to get a call started.  
+Here, we're creating a peer connection required to get a call started.  
 You can also hook up events by directly overwriting functions instead of using event listeners.  
 
 ```javascript
@@ -170,8 +170,8 @@ peerConnection = null;
 
 ## Adding the Media Stream
 
-After using one of the media functions above you can then add the media stream to the peer.  
-The negotiation needed event will be triggered on the peer connection afterwords.  
+After using one of the media functions above, you can then add the media stream to the peer.  
+The negotiation needed event will be triggered on the peer connection afterwards.  
 
 ```javascript
 localMediaStream.getTracks().forEach( 
@@ -195,7 +195,7 @@ datachannel.addEventListener( 'message', message => {} );
 ## Handling Data Channels
 
 The following event is for the second client, not the client which created the data channel.  
-Unless ofcourse you want both sides to create separate data channels.  
+Unless you want both sides to create separate data channels.  
 
 ```javascript
 peerConnection.addEventListener( 'datachannel', event => {
@@ -208,8 +208,8 @@ peerConnection.addEventListener( 'datachannel', event => {
 
 ## Sending a Message via the Data Channel
 
-You can send a range of different data types over data channels, we're gong to send a simple string.  
-Bare in mind there are limits so sending large amounts of data isn't usually advised.  
+You can send a range of different data types over data channels, we're going to send a simple string.  
+Bear in mind that there are limits to sending large amounts of data which isn't usually advised.  
 
 ```javascript
 datachannel.send( 'Hey There!' );
@@ -227,7 +227,7 @@ datachannel = null;
 
 ## Defining Session Constraints
 
-As mentioned above by default we're going for the approach of offering both video and voice.  
+As mentioned above, by default we're going for the approach of offering both video and voice.  
 That will allow you to enable and disable video streams on demand while a call is active.  
 
 ```javascript
@@ -258,8 +258,8 @@ try {
 
 ## Creating an Answer
 
-All parties will need to ensure they are handling ICE Candidates correctly.  
-Otherwise the offer and answer handshake stage will go a little wonky.  
+All parties must ensure the proper handling of ICE Candidates.
+Otherwise, the offer-answer handshake stage might encounter some unexpected behavior.
 
 ```javascript
 try {
@@ -278,8 +278,9 @@ try {
 
 ## Toggle the Active Microphone
 
-During an active call you might want to mute your microphone.  
-Easy to accomplish by flipping the track enabled value to false, also possible on remote tracks.  
+While engaging in a live call, you may find it necessary to mute your microphone. 
+This can be easily achieved by toggling the track enabled value to false.
+This functionality is also applicable to remote tracks.
 
 ```javascript
 let isMuted = false;
@@ -296,7 +297,7 @@ try {
 
 ## Switching the Active Camera
 
-Naturally we assume you'll be using the front camera by default when starting a call.  
+Naturally, we assume you'll be using the front camera by default when starting a call.  
 So we set `isFrontCam` as `true` and let the value flip on execution.  
 
 ```javascript

Documentation/BuildingWebRTC.md

@@ -22,7 +22,7 @@ python build-webrtc.py --setup --ios ~/src/
 ### Android
 
 NOTE: Make sure you have the Java JDK installed beforehand. On Debian and
-Ubuntu systems this can be accomplished by installing the `default-jdk-headless`
+Ubuntu systems, this can be accomplished by installing the `default-jdk-headless`
 package.
 
 ```

Documentation/tvOSInstallation.md

@@ -0,0 +1,21 @@
+# tvOS Installation
+
+In order to use React Native on tvOS, you will need to use [react-native-tvos](https://www.npmjs.com/package/react-native-tvos).  
+tvOS support was deprecated and removed from current/future versions of React Native.  
+We strongly recommend using React Native 0.69+ with React 18+  
+
+Change the following dependency in your projects `package.json` file to get started. 
+``` 
+"react-native": "npm:[email protected]" 
+```
+
+## Adjusting the supported platform version
+
+**IMPORTANT:** Make sure you are using CocoaPods 1.10 or higher.  
+You may have to change the `platform` field in your podfile.  
+`react-native-webrtc` doesn't support tvOS < 16. Set it to '16.0' or above.
+Older versions of tvOS don't support WebRTC.
+
+```
+platform :tvos, '16.0'
+```

ISSUE_TEMPLATE.md

@@ -1,25 +1,40 @@
 <!--
-If you have a question then please ask it on our community Discourse: https://react-native-webrtc.discourse.group/  
-otherwise if you wanted to report a bug then you are in the right place!  
+If you have any questions then please use our Community Discourse: https://react-native-webrtc.discourse.group/  
+Otherwise you are in the right place for reporting bugs.
 
 Please include as much information as possible and make the issue title as descriptive as you can.
--->
-
-#### Expected Behavior
-
+But most of all please take your time and explain to the best of your abilities.
 
+Code samples can be very helpful but even more so if displayed correctly.
+Here is an example of how you can use syntax highlighting.
 
-#### Observed Behavior
+```javascript
 
+console.log( 'Hello World' );
 
+```
 
-#### Steps to reproduce the issue
+More info can be found over here.
+https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks#syntax-highlighting
+-->
 
+#### Expected Behavior:
+<!--
+Explain what you expect to happen.
+-->
 
+#### Observed Behavior:
+<!--
+Explain what is actually happening.
+-->
 
-#### Platform Information
+#### Steps to reproduce the issue:
+<!--
+Explain how the issue can be reproduced.
+If we manage to reproduce the issue then it is more likely to be addressed in an update.
+-->
 
+#### Platform Information  
 * **React Native Version**: 
-* **Plugin Version**: 
-* **OS**: <!-- Android / iOS / macOS / Web / Expo -->
-* **OS Version**: 
+* **WebRTC Module Version**: 
+* **Platform OS + Version**: <!-- Android / iOS / macOS / Web / Expo -->

android/build.gradle

@@ -5,12 +5,17 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 23)
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+      namespace "com.oney.WebRTCModule"
+    }
+
+    compileSdkVersion safeExtGet('compileSdkVersion', 24)
     buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1")
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 19)
-        targetSdkVersion safeExtGet('targetSdkVersion', 23)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
+        targetSdkVersion safeExtGet('targetSdkVersion', 24)
         versionCode 1
         versionName "1.0"
     }
@@ -25,5 +30,6 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'org.jitsi:webrtc:111.+'
+    implementation 'com.github.jiangdongguo.AndroidUSBCamera:libausbc:3.3.3'
+    api 'org.jitsi:webrtc:118.+'
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.oney.WebRTCModule">
+          package="com.oney.WebRTCModule"
+          xmlns:tools="http://schemas.android.com/tools"
+    >
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
+    <application>
+        <service
+                android:name=".MediaProjectionService"
+                android:foregroundServiceType="mediaProjection">
+        </service>
+    </application>
+    <uses-feature
+        android:name="android.hardware.usb.host"
+        android:required="false"
+        tools:node="replace"
+    />
 </manifest>

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

@@ -70,8 +70,13 @@ class GetUserMediaImpl {
         }
 
         if (camera2supported) {
-            Log.d(TAG, "Creating video capturer using Camera2 API.");
-            cameraEnumerator = new Camera2Enumerator(reactContext);
+            if (UVCCamera2Enumerator.isSupported(reactContext)) {
+                Log.d(TAG, "Creating video capturer using Camera2 API with UVC support.");
+                cameraEnumerator = new UVCCamera2Enumerator(reactContext);
+            } else {
+                Log.d(TAG, "Creating video capturer using Camera2 API.");
+                cameraEnumerator = new Camera2Enumerator(reactContext);
+            }
         } else {
             Log.d(TAG, "Creating video capturer using Camera1 API.");
             cameraEnumerator = new Camera1Enumerator(false);
@@ -89,7 +94,11 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
                     }
 
                     mediaProjectionPermissionResultData = data;
-                    createScreenStream();
+
+                    ThreadUtils.runOnExecutor(() -> {
+                        MediaProjectionService.launch(activity);
+                        createScreenStream();
+                    });
                 }
             }
         });
@@ -332,8 +341,7 @@ void createStream(MediaStreamTrack[] tracks, BiConsumer<String, ArrayList<Writab
             trackInfo.putBoolean("enabled", track.enabled());
             trackInfo.putString("id", trackId);
             trackInfo.putString("kind", track.kind());
-            trackInfo.putString("label", trackId);
-            trackInfo.putString("readyState", track.state().toString().toLowerCase());
+            trackInfo.putString("readyState", "live");
             trackInfo.putBoolean("remote", false);
 
             if (track instanceof VideoTrack) {
@@ -500,7 +508,5 @@ public void dispose() {
         }
     }
 
-    public interface BiConsumer<T, U> {
-        void accept(T t, U u);
-    }
+    public interface BiConsumer<T, U> { void accept(T t, U u); }
 }