@sbhjt-gr/react-native-webrtc 124.0.3 → 124.0.4

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

@@ -1,98 +1,98 @@
-package com.oney.WebRTCModule;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.uimanager.SimpleViewManager;
-import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RTCVideoViewManager extends SimpleViewManager<WebRTCView> {
-    private static final String REACT_CLASS = "RTCVideoView";
-
-    @Override
-    public String getName() {
-        return REACT_CLASS;
-    }
-
-    @Override
-    public WebRTCView createViewInstance(ThemedReactContext context) {
-        return new WebRTCView(context);
-    }
-
-    /**
-     * Sets the indicator which determines whether a specific {@link WebRTCView}
-     * is to mirror the video specified by {@code streamURL} during its rendering.
-     * For more details, refer to the documentation of the {@code mirror} property
-     * of the JavaScript counterpart of {@code WebRTCView} i.e. {@code RTCView}.
-     *
-     * @param view The {@code WebRTCView} on which the specified {@code mirror} is
-     * to be set.
-     * @param mirror If the specified {@code WebRTCView} is to mirror the video
-     * specified by its associated {@code streamURL} during its rendering,
-     * {@code true}; otherwise, {@code false}.
-     */
-    @ReactProp(name = "mirror")
-    public void setMirror(WebRTCView view, boolean mirror) {
-        view.setMirror(mirror);
-    }
-
-    /**
-     * In the fashion of
-     * https://www.w3.org/TR/html5/embedded-content-0.html#dom-video-videowidth
-     * and https://www.w3.org/TR/html5/rendering.html#video-object-fit, resembles
-     * the CSS style {@code object-fit}.
-     *
-     * @param view The {@code WebRTCView} on which the specified {@code objectFit}
-     * is to be set.
-     * @param objectFit For details, refer to the documentation of the
-     * {@code objectFit} property of the JavaScript counterpart of
-     * {@code WebRTCView} i.e. {@code RTCView}.
-     */
-    @ReactProp(name = "objectFit")
-    public void setObjectFit(WebRTCView view, String objectFit) {
-        view.setObjectFit(objectFit);
-    }
-
-    @ReactProp(name = "streamURL")
-    public void setStreamURL(WebRTCView view, String streamURL) {
-        view.setStreamURL(streamURL);
-    }
-
-    /**
-     * Sets the z-order of a specific {@link WebRTCView} in the stacking space of
-     * all {@code WebRTCView}s. For more details, refer to the documentation of
-     * the {@code zOrder} property of the JavaScript counterpart of
-     * {@code WebRTCView} i.e. {@code RTCView}.
-     *
-     * @param view The {@code WebRTCView} on which the specified {@code zOrder} is
-     * to be set.
-     * @param zOrder The z-order to set on the specified {@code WebRTCView}.
-     */
-    @ReactProp(name = "zOrder")
-    public void setZOrder(WebRTCView view, int zOrder) {
-        view.setZOrder(zOrder);
-    }
-
-    /**
-     * Sets the callback for when video dimensions change.
-     *
-     * @param view The {@code WebRTCView} on which the callback is to be set.
-     * @param onDimensionsChange The callback to be called when video dimensions change.
-     */
-    @ReactProp(name = "onDimensionsChange")
-    public void setOnDimensionsChange(WebRTCView view, boolean onDimensionsChange) {
-        view.setOnDimensionsChange(onDimensionsChange);
-    }
-
-    @Override
-    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
-        Map<String, Object> eventTypeConstants = new HashMap<>();
-        Map<String, String> dimensionsChangeEvent = new HashMap<>();
-        dimensionsChangeEvent.put("registrationName", "onDimensionsChange");
-        eventTypeConstants.put("onDimensionsChange", dimensionsChangeEvent);
-        return eventTypeConstants;
-    }
-}
+package com.oney.WebRTCModule;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.uimanager.SimpleViewManager;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.RCTEventEmitter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RTCVideoViewManager extends SimpleViewManager<WebRTCView> {
+    private static final String REACT_CLASS = "RTCVideoView";
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public WebRTCView createViewInstance(ThemedReactContext context) {
+        return new WebRTCView(context);
+    }
+
+    /**
+     * Sets the indicator which determines whether a specific {@link WebRTCView}
+     * is to mirror the video specified by {@code streamURL} during its rendering.
+     * For more details, refer to the documentation of the {@code mirror} property
+     * of the JavaScript counterpart of {@code WebRTCView} i.e. {@code RTCView}.
+     *
+     * @param view The {@code WebRTCView} on which the specified {@code mirror} is
+     * to be set.
+     * @param mirror If the specified {@code WebRTCView} is to mirror the video
+     * specified by its associated {@code streamURL} during its rendering,
+     * {@code true}; otherwise, {@code false}.
+     */
+    @ReactProp(name = "mirror")
+    public void setMirror(WebRTCView view, boolean mirror) {
+        view.setMirror(mirror);
+    }
+
+    /**
+     * In the fashion of
+     * https://www.w3.org/TR/html5/embedded-content-0.html#dom-video-videowidth
+     * and https://www.w3.org/TR/html5/rendering.html#video-object-fit, resembles
+     * the CSS style {@code object-fit}.
+     *
+     * @param view The {@code WebRTCView} on which the specified {@code objectFit}
+     * is to be set.
+     * @param objectFit For details, refer to the documentation of the
+     * {@code objectFit} property of the JavaScript counterpart of
+     * {@code WebRTCView} i.e. {@code RTCView}.
+     */
+    @ReactProp(name = "objectFit")
+    public void setObjectFit(WebRTCView view, String objectFit) {
+        view.setObjectFit(objectFit);
+    }
+
+    @ReactProp(name = "streamURL")
+    public void setStreamURL(WebRTCView view, String streamURL) {
+        view.setStreamURL(streamURL);
+    }
+
+    /**
+     * Sets the z-order of a specific {@link WebRTCView} in the stacking space of
+     * all {@code WebRTCView}s. For more details, refer to the documentation of
+     * the {@code zOrder} property of the JavaScript counterpart of
+     * {@code WebRTCView} i.e. {@code RTCView}.
+     *
+     * @param view The {@code WebRTCView} on which the specified {@code zOrder} is
+     * to be set.
+     * @param zOrder The z-order to set on the specified {@code WebRTCView}.
+     */
+    @ReactProp(name = "zOrder")
+    public void setZOrder(WebRTCView view, int zOrder) {
+        view.setZOrder(zOrder);
+    }
+
+    /**
+     * Sets the callback for when video dimensions change.
+     *
+     * @param view The {@code WebRTCView} on which the callback is to be set.
+     * @param onDimensionsChange The callback to be called when video dimensions change.
+     */
+    @ReactProp(name = "onDimensionsChange")
+    public void setOnDimensionsChange(WebRTCView view, boolean onDimensionsChange) {
+        view.setOnDimensionsChange(onDimensionsChange);
+    }
+
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        Map<String, Object> eventTypeConstants = new HashMap<>();
+        Map<String, String> dimensionsChangeEvent = new HashMap<>();
+        dimensionsChangeEvent.put("registrationName", "onDimensionsChange");
+        eventTypeConstants.put("onDimensionsChange", dimensionsChangeEvent);
+        return eventTypeConstants;
+    }
+}

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

@@ -1,36 +1,36 @@
-package com.oney.WebRTCModule;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableType;
-
-public class ReactBridgeUtil {
-    /**
-     * Reads a value from given <tt>ReadableMap</tt> and returns it as
-     * a <tt>String</tt>. Note that integer value is converted to double, before
-     * it gets converted to a string.
-     * @param map the <tt>ReadableMap</tt> from which the value will be obtained
-     * @param key the map's key under which the value has been mapped.
-     * @return a <tt>String</tt> representation of the value if exists or
-     * <tt>null</tt> if there is no value mapped for given <tt>key</tt>.
-     */
-    public static String getMapStrValue(ReadableMap map, String key) {
-        if (!map.hasKey(key)) {
-            return null;
-        }
-        ReadableType type = map.getType(key);
-        switch (type) {
-            case Boolean:
-                return String.valueOf(map.getBoolean(key));
-            case Number:
-                // Don't know how to distinguish between Int and Double from
-                // ReadableType.Number. 'getInt' will fail on double value,
-                // while 'getDouble' works for both.
-                // return String.valueOf(map.getInt(key));
-                return String.valueOf(map.getDouble(key));
-            case String:
-                return map.getString(key);
-            default:
-                return null;
-        }
-    }
+package com.oney.WebRTCModule;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
+
+public class ReactBridgeUtil {
+    /**
+     * Reads a value from given <tt>ReadableMap</tt> and returns it as
+     * a <tt>String</tt>. Note that integer value is converted to double, before
+     * it gets converted to a string.
+     * @param map the <tt>ReadableMap</tt> from which the value will be obtained
+     * @param key the map's key under which the value has been mapped.
+     * @return a <tt>String</tt> representation of the value if exists or
+     * <tt>null</tt> if there is no value mapped for given <tt>key</tt>.
+     */
+    public static String getMapStrValue(ReadableMap map, String key) {
+        if (!map.hasKey(key)) {
+            return null;
+        }
+        ReadableType type = map.getType(key);
+        switch (type) {
+            case Boolean:
+                return String.valueOf(map.getBoolean(key));
+            case Number:
+                // Don't know how to distinguish between Int and Double from
+                // ReadableType.Number. 'getInt' will fail on double value,
+                // while 'getDouble' works for both.
+                // return String.valueOf(map.getInt(key));
+                return String.valueOf(map.getDouble(key));
+            case String:
+                return map.getString(key);
+            default:
+                return null;
+        }
+    }
 }

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

@@ -1,94 +1,94 @@
-package com.oney.WebRTCModule;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.media.projection.MediaProjection;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.OrientationEventListener;
-
-import org.webrtc.ScreenCapturerAndroid;
-import org.webrtc.VideoCapturer;
-
-public class ScreenCaptureController extends AbstractVideoCaptureController {
-    /**
-     * The {@link Log} tag with which {@code ScreenCaptureController} is to log.
-     */
-    private static final String TAG = ScreenCaptureController.class.getSimpleName();
-
-    private static final int DEFAULT_FPS = 30;
-
-    private final Intent mediaProjectionPermissionResultData;
-
-    private final OrientationEventListener orientationListener;
-
-    private final Context context;
-
-    public ScreenCaptureController(Context context, int width, int height, Intent mediaProjectionPermissionResultData) {
-        super(width, height, DEFAULT_FPS);
-
-        this.mediaProjectionPermissionResultData = mediaProjectionPermissionResultData;
-
-        this.context = context;
-
-        this.orientationListener = new OrientationEventListener(context) {
-            @Override
-            public void onOrientationChanged(int orientation) {
-                DisplayMetrics displayMetrics = DisplayUtils.getDisplayMetrics((Activity) context);
-                final int width = displayMetrics.widthPixels;
-                final int height = displayMetrics.heightPixels;
-                if (width != ScreenCaptureController.this.actualWidth
-                        || height != ScreenCaptureController.this.actualHeight) {
-                    ScreenCaptureController.this.actualWidth = width;
-                    ScreenCaptureController.this.actualHeight = height;
-
-                    // Pivot to the executor thread because videoCapturer.changeCaptureFormat runs in the main
-                    // thread and may deadlock.
-                    ThreadUtils.runOnExecutor(() -> {
-                        try {
-                            videoCapturer.changeCaptureFormat(width, height, DEFAULT_FPS);
-                        } catch (Exception ex) {
-                            // We ignore exceptions here. The video capturer runs on its own
-                            // thread and we cannot synchronize with it.
-                        }
-                    });
-                }
-            }
-        };
-
-        if (this.orientationListener.canDetectOrientation()) {
-            this.orientationListener.enable();
-        }
-    }
-
-    @Override
-    public String getDeviceId() {
-        return "screen-capture";
-    }
-
-    @Override
-    public void dispose() {
-        MediaProjectionService.abort(context);
-        super.dispose();
-    }
-
-    @Override
-    protected VideoCapturer createVideoCapturer() {
-        VideoCapturer videoCapturer =
-                new ScreenCapturerAndroid(mediaProjectionPermissionResultData, new MediaProjection.Callback() {
-                    @Override
-                    public void onStop() {
-                        Log.w(TAG, "Media projection stopped.");
-                        orientationListener.disable();
-                        stopCapture();
-
-                        if (capturerEventsListener != null) {
-                            capturerEventsListener.onCapturerEnded();
-                        }
-                    }
-                });
-
-        return videoCapturer;
-    }
-}
+package com.oney.WebRTCModule;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.media.projection.MediaProjection;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.OrientationEventListener;
+
+import org.webrtc.ScreenCapturerAndroid;
+import org.webrtc.VideoCapturer;
+
+public class ScreenCaptureController extends AbstractVideoCaptureController {
+    /**
+     * The {@link Log} tag with which {@code ScreenCaptureController} is to log.
+     */
+    private static final String TAG = ScreenCaptureController.class.getSimpleName();
+
+    private static final int DEFAULT_FPS = 30;
+
+    private final Intent mediaProjectionPermissionResultData;
+
+    private final OrientationEventListener orientationListener;
+
+    private final Context context;
+
+    public ScreenCaptureController(Context context, int width, int height, Intent mediaProjectionPermissionResultData) {
+        super(width, height, DEFAULT_FPS);
+
+        this.mediaProjectionPermissionResultData = mediaProjectionPermissionResultData;
+
+        this.context = context;
+
+        this.orientationListener = new OrientationEventListener(context) {
+            @Override
+            public void onOrientationChanged(int orientation) {
+                DisplayMetrics displayMetrics = DisplayUtils.getDisplayMetrics((Activity) context);
+                final int width = displayMetrics.widthPixels;
+                final int height = displayMetrics.heightPixels;
+                if (width != ScreenCaptureController.this.actualWidth
+                        || height != ScreenCaptureController.this.actualHeight) {
+                    ScreenCaptureController.this.actualWidth = width;
+                    ScreenCaptureController.this.actualHeight = height;
+
+                    // Pivot to the executor thread because videoCapturer.changeCaptureFormat runs in the main
+                    // thread and may deadlock.
+                    ThreadUtils.runOnExecutor(() -> {
+                        try {
+                            videoCapturer.changeCaptureFormat(width, height, DEFAULT_FPS);
+                        } catch (Exception ex) {
+                            // We ignore exceptions here. The video capturer runs on its own
+                            // thread and we cannot synchronize with it.
+                        }
+                    });
+                }
+            }
+        };
+
+        if (this.orientationListener.canDetectOrientation()) {
+            this.orientationListener.enable();
+        }
+    }
+
+    @Override
+    public String getDeviceId() {
+        return "screen-capture";
+    }
+
+    @Override
+    public void dispose() {
+        MediaProjectionService.abort(context);
+        super.dispose();
+    }
+
+    @Override
+    protected VideoCapturer createVideoCapturer() {
+        VideoCapturer videoCapturer =
+                new ScreenCapturerAndroid(mediaProjectionPermissionResultData, new MediaProjection.Callback() {
+                    @Override
+                    public void onStop() {
+                        Log.w(TAG, "Media projection stopped.");
+                        orientationListener.disable();
+                        stopCapture();
+
+                        if (capturerEventsListener != null) {
+                            capturerEventsListener.onCapturerEnded();
+                        }
+                    }
+                });
+
+        return videoCapturer;
+    }
+}