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

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

@@ -1,101 +1,101 @@
-package com.oney.WebRTCModule;
-
-import android.util.Log;
-
-import org.webrtc.PeerConnection;
-import org.webrtc.RTCStats;
-import org.webrtc.RTCStatsReport;
-
-import java.util.Map;
-
-public class StringUtils {
-    private static final String TAG = StringUtils.class.getSimpleName();
-
-    /**
-     * Constructs a JSON <tt>String</tt> representation of a specific array of
-     * <tt>RTCStatsReport</tt>s (produced by {@link PeerConnection#getStats}).
-     * <p>
-     * @param report the <tt>RTCStatsReport</tt>s to represent in JSON
-     *               format
-     * @return a <tt>String</tt> which represents the specified <tt>report</tt>
-     * in JSON format
-     */
-    public static String statsToJSON(RTCStatsReport report) {
-        StringBuilder builder = new StringBuilder("[");
-
-        boolean firstKey = true;
-
-        Map<String, RTCStats> statsMap = report.getStatsMap();
-
-        for (String key : report.getStatsMap().keySet()) {
-            if (firstKey) {
-                firstKey = false;
-            } else {
-                builder.append(",");
-            }
-
-            builder.append("[\"").append(key).append("\",{");
-
-            RTCStats stats = statsMap.get(key);
-            builder.append("\"timestamp\":")
-                    .append(stats.getTimestampUs() / 1000.0)
-                    .append(",\"type\":\"")
-                    .append(stats.getType())
-                    .append("\",\"id\":\"")
-                    .append(stats.getId())
-                    .append("\"");
-
-            for (Map.Entry<String, Object> entry : stats.getMembers().entrySet()) {
-                builder.append(",").append("\"").append(entry.getKey()).append("\":");
-                appendValue(builder, entry.getValue());
-            }
-
-            builder.append("}]");
-        }
-
-        builder.append("]");
-
-        return builder.toString();
-    }
-
-    private static void appendValue(StringBuilder builder, Object value) {
-        if (value instanceof Object[]) {
-            Object[] arrayValue = (Object[]) value;
-            builder.append("[");
-
-            for (int i = 0; i < arrayValue.length; ++i) {
-                if (i != 0) {
-                    builder.append(",");
-                }
-
-                appendValue(builder, arrayValue[i]);
-            }
-
-            builder.append("]");
-        } else if (value instanceof Map) {
-            try {
-                Map<String, Object> mapValue = (Map) value;
-
-                boolean firstKey = true;
-                builder.append("{");
-
-                for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
-                    if (firstKey) {
-                        firstKey = false;
-                    } else {
-                        builder.append(",");
-                    }
-                    builder.append("\"").append(entry.getKey()).append("\":");
-                    appendValue(builder, entry.getValue());
-                }
-                builder.append("}");
-            } catch (ClassCastException e) {
-                Log.e(TAG, "Error parsing stats value " + value);
-            }
-        } else if (value instanceof String) {
-            builder.append("\"").append(value).append("\"");
-        } else {
-            builder.append(value);
-        }
-    }
+package com.oney.WebRTCModule;
+
+import android.util.Log;
+
+import org.webrtc.PeerConnection;
+import org.webrtc.RTCStats;
+import org.webrtc.RTCStatsReport;
+
+import java.util.Map;
+
+public class StringUtils {
+    private static final String TAG = StringUtils.class.getSimpleName();
+
+    /**
+     * Constructs a JSON <tt>String</tt> representation of a specific array of
+     * <tt>RTCStatsReport</tt>s (produced by {@link PeerConnection#getStats}).
+     * <p>
+     * @param report the <tt>RTCStatsReport</tt>s to represent in JSON
+     *               format
+     * @return a <tt>String</tt> which represents the specified <tt>report</tt>
+     * in JSON format
+     */
+    public static String statsToJSON(RTCStatsReport report) {
+        StringBuilder builder = new StringBuilder("[");
+
+        boolean firstKey = true;
+
+        Map<String, RTCStats> statsMap = report.getStatsMap();
+
+        for (String key : report.getStatsMap().keySet()) {
+            if (firstKey) {
+                firstKey = false;
+            } else {
+                builder.append(",");
+            }
+
+            builder.append("[\"").append(key).append("\",{");
+
+            RTCStats stats = statsMap.get(key);
+            builder.append("\"timestamp\":")
+                    .append(stats.getTimestampUs() / 1000.0)
+                    .append(",\"type\":\"")
+                    .append(stats.getType())
+                    .append("\",\"id\":\"")
+                    .append(stats.getId())
+                    .append("\"");
+
+            for (Map.Entry<String, Object> entry : stats.getMembers().entrySet()) {
+                builder.append(",").append("\"").append(entry.getKey()).append("\":");
+                appendValue(builder, entry.getValue());
+            }
+
+            builder.append("}]");
+        }
+
+        builder.append("]");
+
+        return builder.toString();
+    }
+
+    private static void appendValue(StringBuilder builder, Object value) {
+        if (value instanceof Object[]) {
+            Object[] arrayValue = (Object[]) value;
+            builder.append("[");
+
+            for (int i = 0; i < arrayValue.length; ++i) {
+                if (i != 0) {
+                    builder.append(",");
+                }
+
+                appendValue(builder, arrayValue[i]);
+            }
+
+            builder.append("]");
+        } else if (value instanceof Map) {
+            try {
+                Map<String, Object> mapValue = (Map) value;
+
+                boolean firstKey = true;
+                builder.append("{");
+
+                for (Map.Entry<String, Object> entry : mapValue.entrySet()) {
+                    if (firstKey) {
+                        firstKey = false;
+                    } else {
+                        builder.append(",");
+                    }
+                    builder.append("\"").append(entry.getKey()).append("\":");
+                    appendValue(builder, entry.getValue());
+                }
+                builder.append("}");
+            } catch (ClassCastException e) {
+                Log.e(TAG, "Error parsing stats value " + value);
+            }
+        } else if (value instanceof String) {
+            builder.append("\"").append(value).append("\"");
+        } else {
+            builder.append(value);
+        }
+    }
 }

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

@@ -1,41 +1,41 @@
-package com.oney.WebRTCModule;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-final class ThreadUtils {
-    /**
-     * Thread which will be used to call all WebRTC PeerConnection APIs. They
-     * they don't run on the calling thread anyway, we are deferring the calls
-     * to this thread to avoid (potentially) blocking the calling thread.
-     */
-    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    /**
-     * Runs the given {@link Runnable} on the executor.
-     * @param runnable
-     */
-    public static void runOnExecutor(Runnable runnable) {
-        executor.execute(runnable);
-    }
-
-    /**
-     * Submits the given {@link Callable} to be run on the executor.
-     * @param callable
-     * @return Future.
-     */
-    public static <T> Future<T> submitToExecutor(Callable<T> callable) {
-        return executor.submit(callable);
-    }
-
-    /**
-     * Submits the given {@link Runnable} to be run on the executor.
-     * @param runnable
-     * @return Future.
-     */
-    public static Future<?> submitToExecutor(Runnable runnable) {
-        return executor.submit(runnable);
-    }
-}
+package com.oney.WebRTCModule;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+final class ThreadUtils {
+    /**
+     * Thread which will be used to call all WebRTC PeerConnection APIs. They
+     * they don't run on the calling thread anyway, we are deferring the calls
+     * to this thread to avoid (potentially) blocking the calling thread.
+     */
+    private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+    /**
+     * Runs the given {@link Runnable} on the executor.
+     * @param runnable
+     */
+    public static void runOnExecutor(Runnable runnable) {
+        executor.execute(runnable);
+    }
+
+    /**
+     * Submits the given {@link Callable} to be run on the executor.
+     * @param callable
+     * @return Future.
+     */
+    public static <T> Future<T> submitToExecutor(Callable<T> callable) {
+        return executor.submit(callable);
+    }
+
+    /**
+     * Submits the given {@link Runnable} to be run on the executor.
+     * @param runnable
+     * @return Future.
+     */
+    public static Future<?> submitToExecutor(Runnable runnable) {
+        return executor.submit(runnable);
+    }
+}

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

@@ -1,34 +1,34 @@
-package com.oney.WebRTCModule;
-
-import android.util.*;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-import org.webrtc.CapturerObserver;
-import org.webrtc.VideoFrame;
-
-/**
- * A capturer observer that emits track ended events when the capturer is stopped.
- */
-public class TrackCapturerEventsEmitter implements AbstractVideoCaptureController.CapturerEventsListener {
-    private static final String TAG = TrackCapturerEventsEmitter.class.getCanonicalName();
-
-    private final WebRTCModule webRTCModule;
-    private final String trackId;
-
-    public TrackCapturerEventsEmitter(WebRTCModule webRTCModule, String trackId) {
-        this.webRTCModule = webRTCModule;
-        this.trackId = trackId;
-    }
-
-    /** Notify that the capturer has been stopped. */
-    public void onCapturerEnded() {
-        WritableMap params = Arguments.createMap();
-        params.putString("trackId", trackId);
-
-        Log.d(TAG, "ended event trackId: " + trackId);
-
-        webRTCModule.sendEvent("mediaStreamTrackEnded", params);
-    }
-}
+package com.oney.WebRTCModule;
+
+import android.util.*;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+
+import org.webrtc.CapturerObserver;
+import org.webrtc.VideoFrame;
+
+/**
+ * A capturer observer that emits track ended events when the capturer is stopped.
+ */
+public class TrackCapturerEventsEmitter implements AbstractVideoCaptureController.CapturerEventsListener {
+    private static final String TAG = TrackCapturerEventsEmitter.class.getCanonicalName();
+
+    private final WebRTCModule webRTCModule;
+    private final String trackId;
+
+    public TrackCapturerEventsEmitter(WebRTCModule webRTCModule, String trackId) {
+        this.webRTCModule = webRTCModule;
+        this.trackId = trackId;
+    }
+
+    /** Notify that the capturer has been stopped. */
+    public void onCapturerEnded() {
+        WritableMap params = Arguments.createMap();
+        params.putString("trackId", trackId);
+
+        Log.d(TAG, "ended event trackId: " + trackId);
+
+        webRTCModule.sendEvent("mediaStreamTrackEnded", params);
+    }
+}

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

@@ -1,137 +1,137 @@
-package com.oney.WebRTCModule;
-
-import android.util.*;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-
-import org.webrtc.VideoFrame;
-import org.webrtc.VideoSink;
-import org.webrtc.VideoTrack;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Implements mute/unmute events for remote video tracks.
- * Mute event is fired when there are no frames to be render for 1500ms
- * initially and 500ms after the first frame was received.
- */
-public class VideoTrackAdapter {
-    static final String TAG = VideoTrackAdapter.class.getCanonicalName();
-    static final long INITIAL_MUTE_DELAY = 3000;
-    static final long MUTE_DELAY = 1500;
-
-    private Map<String, TrackMuteUnmuteImpl> muteImplMap = new HashMap<>();
-
-    private Timer timer = new Timer("VideoTrackMutedTimer");
-
-    private final int peerConnectionId;
-
-    private final WebRTCModule webRTCModule;
-
-    public VideoTrackAdapter(WebRTCModule webRTCModule, int peerConnectionId) {
-        this.peerConnectionId = peerConnectionId;
-        this.webRTCModule = webRTCModule;
-    }
-
-    public void addAdapter(VideoTrack videoTrack) {
-        String trackId = videoTrack.id();
-        if (muteImplMap.containsKey(trackId)) {
-            Log.w(TAG, "Attempted to add adapter twice for track ID: " + trackId);
-            return;
-        }
-
-        TrackMuteUnmuteImpl onMuteImpl = new TrackMuteUnmuteImpl(trackId);
-        Log.d(TAG, "Created adapter for " + trackId);
-        muteImplMap.put(trackId, onMuteImpl);
-        videoTrack.addSink(onMuteImpl);
-        onMuteImpl.start();
-    }
-
-    public void removeAdapter(VideoTrack videoTrack) {
-        String trackId = videoTrack.id();
-        TrackMuteUnmuteImpl onMuteImpl = muteImplMap.remove(trackId);
-        if (onMuteImpl == null) {
-            Log.w(TAG, "removeAdapter - no adapter for " + trackId);
-            return;
-        }
-
-        videoTrack.removeSink(onMuteImpl);
-        onMuteImpl.dispose();
-        Log.d(TAG, "Deleted adapter for " + trackId);
-    }
-
-    /**
-     * Implements 'mute'/'unmute' events for remote video tracks through
-     * the {@link VideoSink} interface.
-     */
-    private class TrackMuteUnmuteImpl implements VideoSink {
-        private TimerTask emitMuteTask;
-        private volatile boolean disposed;
-        private AtomicInteger frameCounter;
-        private boolean mutedState;
-        private final String trackId;
-
-        TrackMuteUnmuteImpl(String trackId) {
-            this.trackId = trackId;
-            this.frameCounter = new AtomicInteger();
-        }
-
-        @Override
-        public void onFrame(VideoFrame frame) {
-            frameCounter.addAndGet(1);
-        }
-
-        private void start() {
-            if (disposed) {
-                return;
-            }
-
-            synchronized (this) {
-                if (emitMuteTask != null) {
-                    emitMuteTask.cancel();
-                }
-                emitMuteTask = new TimerTask() {
-                    private int lastFrameNumber = frameCounter.get();
-
-                    @Override
-                    public void run() {
-                        if (disposed) {
-                            return;
-                        }
-                        boolean isMuted = lastFrameNumber == frameCounter.get();
-                        if (isMuted != mutedState) {
-                            mutedState = isMuted;
-                            emitMuteEvent(isMuted);
-                        }
-
-                        lastFrameNumber = frameCounter.get();
-                    }
-                };
-                timer.schedule(emitMuteTask, INITIAL_MUTE_DELAY, MUTE_DELAY);
-            }
-        }
-
-        private void emitMuteEvent(boolean muted) {
-            WritableMap params = Arguments.createMap();
-            params.putInt("pcId", peerConnectionId);
-            params.putString("trackId", trackId);
-            params.putBoolean("muted", muted);
-
-            Log.d(TAG, (muted ? "Mute" : "Unmute") + " event pcId: " + peerConnectionId + " trackId: " + trackId);
-
-            VideoTrackAdapter.this.webRTCModule.sendEvent("mediaStreamTrackMuteChanged", params);
-        }
-
-        void dispose() {
-            disposed = true;
-            synchronized (this) {
-                if (emitMuteTask != null) {
-                    emitMuteTask.cancel();
-                    emitMuteTask = null;
-                }
-            }
-        }
-    }
-}
+package com.oney.WebRTCModule;
+
+import android.util.*;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+
+import org.webrtc.VideoFrame;
+import org.webrtc.VideoSink;
+import org.webrtc.VideoTrack;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Implements mute/unmute events for remote video tracks.
+ * Mute event is fired when there are no frames to be render for 1500ms
+ * initially and 500ms after the first frame was received.
+ */
+public class VideoTrackAdapter {
+    static final String TAG = VideoTrackAdapter.class.getCanonicalName();
+    static final long INITIAL_MUTE_DELAY = 3000;
+    static final long MUTE_DELAY = 1500;
+
+    private Map<String, TrackMuteUnmuteImpl> muteImplMap = new HashMap<>();
+
+    private Timer timer = new Timer("VideoTrackMutedTimer");
+
+    private final int peerConnectionId;
+
+    private final WebRTCModule webRTCModule;
+
+    public VideoTrackAdapter(WebRTCModule webRTCModule, int peerConnectionId) {
+        this.peerConnectionId = peerConnectionId;
+        this.webRTCModule = webRTCModule;
+    }
+
+    public void addAdapter(VideoTrack videoTrack) {
+        String trackId = videoTrack.id();
+        if (muteImplMap.containsKey(trackId)) {
+            Log.w(TAG, "Attempted to add adapter twice for track ID: " + trackId);
+            return;
+        }
+
+        TrackMuteUnmuteImpl onMuteImpl = new TrackMuteUnmuteImpl(trackId);
+        Log.d(TAG, "Created adapter for " + trackId);
+        muteImplMap.put(trackId, onMuteImpl);
+        videoTrack.addSink(onMuteImpl);
+        onMuteImpl.start();
+    }
+
+    public void removeAdapter(VideoTrack videoTrack) {
+        String trackId = videoTrack.id();
+        TrackMuteUnmuteImpl onMuteImpl = muteImplMap.remove(trackId);
+        if (onMuteImpl == null) {
+            Log.w(TAG, "removeAdapter - no adapter for " + trackId);
+            return;
+        }
+
+        videoTrack.removeSink(onMuteImpl);
+        onMuteImpl.dispose();
+        Log.d(TAG, "Deleted adapter for " + trackId);
+    }
+
+    /**
+     * Implements 'mute'/'unmute' events for remote video tracks through
+     * the {@link VideoSink} interface.
+     */
+    private class TrackMuteUnmuteImpl implements VideoSink {
+        private TimerTask emitMuteTask;
+        private volatile boolean disposed;
+        private AtomicInteger frameCounter;
+        private boolean mutedState;
+        private final String trackId;
+
+        TrackMuteUnmuteImpl(String trackId) {
+            this.trackId = trackId;
+            this.frameCounter = new AtomicInteger();
+        }
+
+        @Override
+        public void onFrame(VideoFrame frame) {
+            frameCounter.addAndGet(1);
+        }
+
+        private void start() {
+            if (disposed) {
+                return;
+            }
+
+            synchronized (this) {
+                if (emitMuteTask != null) {
+                    emitMuteTask.cancel();
+                }
+                emitMuteTask = new TimerTask() {
+                    private int lastFrameNumber = frameCounter.get();
+
+                    @Override
+                    public void run() {
+                        if (disposed) {
+                            return;
+                        }
+                        boolean isMuted = lastFrameNumber == frameCounter.get();
+                        if (isMuted != mutedState) {
+                            mutedState = isMuted;
+                            emitMuteEvent(isMuted);
+                        }
+
+                        lastFrameNumber = frameCounter.get();
+                    }
+                };
+                timer.schedule(emitMuteTask, INITIAL_MUTE_DELAY, MUTE_DELAY);
+            }
+        }
+
+        private void emitMuteEvent(boolean muted) {
+            WritableMap params = Arguments.createMap();
+            params.putInt("pcId", peerConnectionId);
+            params.putString("trackId", trackId);
+            params.putBoolean("muted", muted);
+
+            Log.d(TAG, (muted ? "Mute" : "Unmute") + " event pcId: " + peerConnectionId + " trackId: " + trackId);
+
+            VideoTrackAdapter.this.webRTCModule.sendEvent("mediaStreamTrackMuteChanged", params);
+        }
+
+        void dispose() {
+            disposed = true;
+            synchronized (this) {
+                if (emitMuteTask != null) {
+                    emitMuteTask.cancel();
+                    emitMuteTask = null;
+                }
+            }
+        }
+    }
+}