@100mslive/react-native-hms 1.4.0 → 1.6.0

package/android/src/main/java/com/reactnativehmssdk/HMSSDKViewManager.kt

@@ -80,6 +80,11 @@ class HMSSDKViewManager : SimpleViewManager<HMSView>() {
     view.updateZOrderMediaOverlay(data)
   }
 
+  @ReactProp(name = "autoSimulcast")
+  fun setAutoSimulcast(view: HMSView, data: Boolean?) {
+    data?.let { view.updateAutoSimulcast(it) }
+  }
+
   private fun getHms(): MutableMap<String, HMSRNSDK>? {
     return reactContext?.getNativeModule(HMSManager::class.java)?.getHmsInstance()
   }

package/android/src/main/java/com/reactnativehmssdk/HMSView.kt

@@ -3,6 +3,7 @@ package com.reactnativehmssdk
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Build
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.annotation.RequiresApi
@@ -13,30 +14,33 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import live.hms.video.media.tracks.HMSVideoTrack
 import live.hms.video.utils.HmsUtilities
-import live.hms.video.utils.SharedEglContext
+import live.hms.videoview.HMSVideoView
 import org.webrtc.RendererCommon
-import org.webrtc.SurfaceViewRenderer
 
 @SuppressLint("ViewConstructor")
 class HMSView(context: ReactContext) : FrameLayout(context) {
-  private var surfaceView: SurfaceViewRenderer = SurfaceViewRenderer(context)
+  private var hmsVideoView: HMSVideoView = HMSVideoView(context)
   private var videoTrack: HMSVideoTrack? = null
   private var scaleTypeApplied: Boolean = false
   private var sdkId: String = "12345"
   private var currentScaleType: RendererCommon.ScalingType =
-      RendererCommon.ScalingType.SCALE_ASPECT_FILL
+    RendererCommon.ScalingType.SCALE_ASPECT_FILL
+  private var disableAutoSimulcastLayerSelect = false
 
   init {
     val inflater = getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
     val view = inflater.inflate(R.layout.hms_view, this)
 
-    surfaceView = view.findViewById(R.id.surfaceView)
-    surfaceView.setEnableHardwareScaler(false)
+    hmsVideoView = view.findViewById(R.id.hmsVideoView)
+    hmsVideoView.setEnableHardwareScaler(false)
+    hmsVideoView.setScalingType(currentScaleType)
+    hmsVideoView.setMirror(false)
+    hmsVideoView.disableAutoSimulcastLayerSelect(disableAutoSimulcastLayerSelect)
   }
 
   @RequiresApi(Build.VERSION_CODES.N)
   fun captureHmsView(args: ReadableArray?) {
-    HMSHelper.captureSurfaceView(surfaceView, sdkId, args, context, id)
+    HMSHelper.captureSurfaceView(hmsVideoView, sdkId, args, context, id)
   }
 
   private fun onReceiveNativeEvent() {
@@ -48,26 +52,32 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    videoTrack?.removeSink(surfaceView)
-    surfaceView.release()
+    hmsVideoView.removeTrack()
   }
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    surfaceView.init(SharedEglContext.context, null)
-    videoTrack?.addSink(surfaceView)
-    if (!scaleTypeApplied) {
-      if (currentScaleType != RendererCommon.ScalingType.SCALE_ASPECT_FILL) {
-        onReceiveNativeEvent()
+
+    videoTrack?.let { // Safe Call Operator to check if videoTrack is not null
+      hmsVideoView.addTrack(it) // add the videoTrack to the hmsVideoView
+      if (!scaleTypeApplied) { // check if the scaleTypeApplied flag is false
+        if (currentScaleType != RendererCommon.ScalingType.SCALE_ASPECT_FILL) { // check if the currentScaleType is not SCALE_ASPECT_FILL
+          onReceiveNativeEvent() // call the onReceiveNativeEvent function
+        }
+        scaleTypeApplied = true // set the scaleTypeApplied flag to true
       }
-      scaleTypeApplied = true
+    } ?: run { // Elvis Operator to handle the case when videoTrack is null
+      Log.e(
+        "HMSView",
+        "HMSView attached to window, but it's videoTrack is null",
+      ) // log an error message
     }
   }
 
   fun updateZOrderMediaOverlay(setZOrderMediaOverlay: Boolean?) {
     if (setZOrderMediaOverlay != null && setZOrderMediaOverlay) {
-      // surfaceView.setZOrderOnTop(true);
-      surfaceView.setZOrderMediaOverlay(setZOrderMediaOverlay)
+      // hmsVideoView.setZOrderOnTop(true);
+      hmsVideoView.setZOrderMediaOverlay(setZOrderMediaOverlay)
     }
   }
 
@@ -75,17 +85,17 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
     if (scaleType != null) {
       when (scaleType) {
         "ASPECT_FIT" -> {
-          surfaceView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
+          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT)
           currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FIT
           return
         }
         "ASPECT_FILL" -> {
-          surfaceView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
+          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
           currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_FILL
           return
         }
         "ASPECT_BALANCED" -> {
-          surfaceView.setScalingType((RendererCommon.ScalingType.SCALE_ASPECT_BALANCED))
+          hmsVideoView.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_BALANCED)
           currentScaleType = RendererCommon.ScalingType.SCALE_ASPECT_BALANCED
           return
         }
@@ -97,10 +107,10 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
   }
 
   fun setData(
-      id: String?,
-      trackId: String?,
-      hmsCollection: MutableMap<String, HMSRNSDK>,
-      mirror: Boolean?
+    id: String?,
+    trackId: String?,
+    hmsCollection: MutableMap<String, HMSRNSDK>,
+    mirror: Boolean?,
   ) {
     if (id != null) {
       sdkId = id
@@ -109,9 +119,16 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
 
     if (trackId != null && hms != null) {
       if (mirror != null) {
-        surfaceView.setMirror(mirror)
+        hmsVideoView.setMirror(mirror)
       }
+      // TODO: can be optimized here
       videoTrack = hms.getRoom()?.let { HmsUtilities.getVideoTrack(trackId, it) }
     }
   }
+
+  fun updateAutoSimulcast(autoSimulcast: Boolean?) {
+    autoSimulcast?.let {
+      hmsVideoView.disableAutoSimulcastLayerSelect(!it)
+    }
+  }
 }

package/android/src/main/res/layout/hms_view.xml

@@ -6,8 +6,8 @@
   android:layout_height="match_parent"
   android:background="#000">
 
-  <org.webrtc.SurfaceViewRenderer
-    android:id="@+id/surfaceView"
+  <live.hms.videoview.HMSVideoView
+    android:id="@+id/hmsVideoView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"

package/ios/HMSConstants.swift

@@ -0,0 +1,33 @@
+//
+//  HMSConstants.swift
+//  HMSSDK
+//
+//  Created by Yogesh Singh on 27/12/22.
+//  Copyright © 2023 100ms. All rights reserved.
+//
+
+import Foundation
+
+struct HMSConstants {
+
+    static let ON_PREVIEW = "ON_PREVIEW"
+    static let ON_JOIN = "ON_JOIN"
+    static let ON_ROOM_UPDATE = "ON_ROOM_UPDATE"
+    static let ON_PEER_UPDATE = "3"
+    static let ON_TRACK_UPDATE = "ON_TRACK_UPDATE"
+    static let ON_ROLE_CHANGE_REQUEST = "ON_ROLE_CHANGE_REQUEST"
+    static let ON_CHANGE_TRACK_STATE_REQUEST = "ON_CHANGE_TRACK_STATE_REQUEST"
+    static let ON_REMOVED_FROM_ROOM = "ON_REMOVED_FROM_ROOM"
+    static let ON_ERROR = "ON_ERROR"
+    static let ON_MESSAGE = "ON_MESSAGE"
+    static let ON_SPEAKER = "ON_SPEAKER"
+    static let RECONNECTING = "RECONNECTING"
+    static let RECONNECTED = "RECONNECTED"
+    static let ON_RTC_STATS = "ON_RTC_STATS"
+    static let ON_LOCAL_AUDIO_STATS = "ON_LOCAL_AUDIO_STATS"
+    static let ON_LOCAL_VIDEO_STATS = "ON_LOCAL_VIDEO_STATS"
+    static let ON_REMOTE_AUDIO_STATS = "ON_REMOTE_AUDIO_STATS"
+    static let ON_REMOTE_VIDEO_STATS = "ON_REMOTE_VIDEO_STATS"
+    static let ON_SESSION_STORE_AVAILABLE = "ON_SESSION_STORE_AVAILABLE"
+    static let ON_SESSION_STORE_CHANGED = "ON_SESSION_STORE_CHANGED"
+}