@100mslive/react-native-hms 1.7.2 → 1.8.0

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

@@ -25,6 +25,7 @@ class HMSAudioshareActivity : ComponentActivity() {
               HMSManager.hmsCollection[id]?.audioshareCallback?.reject(error)
               HMSManager.hmsCollection[id]?.emitHMSError(error)
             }
+
             override fun onSuccess() {
               HMSManager.hmsCollection[id]?.isAudioSharing = true
               HMSManager.hmsCollection[id]?.audioshareCallback?.resolve(

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

@@ -16,7 +16,10 @@ import live.hms.video.sdk.models.trackchangerequest.HMSChangeTrackStateRequest
 object HMSDecoder {
   private var restrictRoleData = mutableMapOf<String, Boolean>()
 
-  fun setRestrictRoleData(roleName: String, value: Boolean) {
+  fun setRestrictRoleData(
+    roleName: String,
+    value: Boolean,
+  ) {
     this.restrictRoleData[roleName] = value
   }
 
@@ -24,7 +27,10 @@ object HMSDecoder {
     this.restrictRoleData.clear()
   }
 
-  fun getHmsRoomSubset(hmsRoom: HMSRoom?, hmsRoomUpdateType: HMSRoomUpdate? = null): WritableMap {
+  fun getHmsRoomSubset(
+    hmsRoom: HMSRoom?,
+    hmsRoomUpdateType: HMSRoomUpdate? = null,
+  ): WritableMap {
     val room: WritableMap = Arguments.createMap()
     if (hmsRoom != null) {
       room.putString("id", hmsRoom.roomId)
@@ -142,7 +148,10 @@ object HMSDecoder {
     return room
   }
 
-  fun getHmsPeerSubsetForPeerUpdateEvent(hmsPeer: HMSPeer?, peerUpdateType: HMSPeerUpdate): WritableMap {
+  fun getHmsPeerSubsetForPeerUpdateEvent(
+    hmsPeer: HMSPeer?,
+    peerUpdateType: HMSPeerUpdate,
+  ): WritableMap {
     val peer: WritableMap = Arguments.createMap()
     if (hmsPeer != null) {
       peer.putString(peerUpdateType.ordinal.toString(), hmsPeer.peerID)
@@ -171,7 +180,10 @@ object HMSDecoder {
     return peer
   }
 
-  fun getHmsPeerSubset(hmsPeer: HMSPeer?, peerUpdateType: HMSPeerUpdate? = null): WritableMap {
+  fun getHmsPeerSubset(
+    hmsPeer: HMSPeer?,
+    peerUpdateType: HMSPeerUpdate? = null,
+  ): WritableMap {
     val peer: WritableMap = Arguments.createMap()
     if (hmsPeer != null) {
       peer.putString("peerID", hmsPeer.peerID)
@@ -564,7 +576,10 @@ object HMSDecoder {
     return hmsTracks
   }
 
-  fun getHmsRoleChangeRequest(request: HMSRoleChangeRequest, id: String?): WritableMap {
+  fun getHmsRoleChangeRequest(
+    request: HMSRoleChangeRequest,
+    id: String?,
+  ): WritableMap {
     val roleChangeRequest: WritableMap = Arguments.createMap()
     if (id != null) {
       request.requestedBy?.let {
@@ -577,7 +592,10 @@ object HMSDecoder {
     return roleChangeRequest
   }
 
-  fun getHmsChangeTrackStateRequest(request: HMSChangeTrackStateRequest, id: String): WritableMap {
+  fun getHmsChangeTrackStateRequest(
+    request: HMSChangeTrackStateRequest,
+    id: String,
+  ): WritableMap {
     val changeTrackStateRequest: WritableMap = Arguments.createMap()
 
     request.requestedBy?.let {
@@ -722,9 +740,7 @@ object HMSDecoder {
     return subscribeSettings
   }
 
-  private fun getHmsSubscribeDegradationSettings(
-    hmsSubscribeDegradationParams: SubscribeDegradationParams?,
-  ): WritableMap {
+  private fun getHmsSubscribeDegradationSettings(hmsSubscribeDegradationParams: SubscribeDegradationParams?): WritableMap {
     val subscribeDegradationParams: WritableMap = Arguments.createMap()
     if (hmsSubscribeDegradationParams != null) {
       subscribeDegradationParams.putString(
@@ -862,7 +878,9 @@ object HMSDecoder {
       hmsQualityLimitationReasons.cpu?.let { qualityLimitationReasons.putDouble("cpu", it) }
       hmsQualityLimitationReasons.none?.let { qualityLimitationReasons.putDouble("none", it) }
       hmsQualityLimitationReasons.other?.let { qualityLimitationReasons.putDouble("other", it) }
-      hmsQualityLimitationReasons.qualityLimitationResolutionChanges?.let { qualityLimitationReasons.putInt("qualityLimitationResolutionChanges", it.toInt()) }
+      hmsQualityLimitationReasons.qualityLimitationResolutionChanges?.let {
+        qualityLimitationReasons.putInt("qualityLimitationResolutionChanges", it.toInt())
+      }
       qualityLimitationReasons.putString("reason", hmsQualityLimitationReasons.reason.name)
     }
     return qualityLimitationReasons

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

@@ -4,6 +4,10 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.FrameLayout
+import androidx.media3.common.Player
+import androidx.media3.common.VideoSize
+import androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT
+import androidx.media3.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM
 import androidx.media3.ui.PlayerView
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactContext
@@ -22,83 +26,85 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
   private var hmsHlsPlayer: HmsHlsPlayer? = null // 100ms HLS Player
   private var hmssdkInstance: HMSSDK? = null
   private var statsMonitorAttached = false
-  private val hmsHlsPlaybackEventsObject = object : HmsHlsPlaybackEvents {
-    override fun onCue(cue: HmsHlsCue) {
-      super.onCue(cue)
+  private val hmsHlsPlaybackEventsObject =
+    object : HmsHlsPlaybackEvents {
+      override fun onCue(cue: HmsHlsCue) {
+        super.onCue(cue)
+
+        val data = Arguments.createMap()
+        cue.endDate?.let { data.putString("endDate", it.time.toString()) }
+        cue.id?.let { data.putString("id", it) }
+        cue.payloadval?.let { data.putString("payloadval", it) }
+        data.putString("startDate", cue.startDate.time.toString())
+
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_CUE_EVENT, data)
+      }
 
-      val data = Arguments.createMap()
-      cue.endDate?.let { data.putString("endDate", it.time.toString()) }
-      cue.id?.let { data.putString("id", it) }
-      cue.payloadval?.let { data.putString("payloadval", it) }
-      data.putString("startDate", cue.startDate.time.toString())
+      override fun onPlaybackFailure(error: HmsHlsException) {
+        super.onPlaybackFailure(error)
 
-      sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_CUE_EVENT, data)
-    }
+        val data = Arguments.createMap()
 
-    override fun onPlaybackFailure(error: HmsHlsException) {
-      super.onPlaybackFailure(error)
+        // error
+        val errorData = Arguments.createMap()
+        errorData.putInt("errorCode", error.error.errorCode)
+        errorData.putString("errorCodeName", error.error.errorCodeName)
+        error.error.message?.let {
+          errorData.putString("message", it)
+        }
 
-      val data = Arguments.createMap()
+        data.putMap("error", errorData)
 
-      // error
-      val errorData = Arguments.createMap()
-      errorData.putInt("errorCode", error.error.errorCode)
-      errorData.putString("errorCodeName", error.error.errorCodeName)
-      error.error.message?.let {
-        errorData.putString("message", it)
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_FAILURE_EVENT, data)
       }
 
-      data.putMap("error", errorData)
-
-      sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_FAILURE_EVENT, data)
-    }
-
-    override fun onPlaybackStateChanged(state: HmsHlsPlaybackState) {
-      super.onPlaybackStateChanged(state)
-
-      val data = Arguments.createMap()
-      data.putString("state", state.name)
-      sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
-    }
-  }
-  private val hmsHlsPlayerStatsListenerObject = object : PlayerStatsListener {
-    override fun onError(error: HMSException) {
-      val data = Arguments.createMap()
-
-      data.putString("action", error.action)
-      data.putInt("code", error.code)
-      data.putString("description", error.description)
-      data.putBoolean("isTerminal", error.isTerminal)
-      data.putString("message", error.message)
-      data.putString("name", error.name)
+      override fun onPlaybackStateChanged(state: HmsHlsPlaybackState) {
+        super.onPlaybackStateChanged(state)
 
-      sendHLSStatsEventToJS(HMSHLSPlayerConstants.ON_STATS_EVENT_ERROR, data)
+        val data = Arguments.createMap()
+        data.putString("state", state.name)
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+      }
     }
+  private val hmsHlsPlayerStatsListenerObject =
+    object : PlayerStatsListener {
+      override fun onError(error: HMSException) {
+        val data = Arguments.createMap()
+
+        data.putString("action", error.action)
+        data.putInt("code", error.code)
+        data.putString("description", error.description)
+        data.putBoolean("isTerminal", error.isTerminal)
+        data.putString("message", error.message)
+        data.putString("name", error.name)
+
+        sendHLSStatsEventToJS(HMSHLSPlayerConstants.ON_STATS_EVENT_ERROR, data)
+      }
 
-    override fun onEventUpdate(playerStatsModel: PlayerStatsModel) {
-      val data = Arguments.createMap()
+      override fun onEventUpdate(playerStatsModel: PlayerStatsModel) {
+        val data = Arguments.createMap()
 
-      // bandwidth
-      data.putInt("bandWidthEstimate", playerStatsModel.bandwidth.bandWidthEstimate.toInt())
-      data.putInt("totalBytesLoaded", playerStatsModel.bandwidth.totalBytesLoaded.toInt())
+        // bandwidth
+        data.putInt("bandWidthEstimate", playerStatsModel.bandwidth.bandWidthEstimate.toInt())
+        data.putInt("totalBytesLoaded", playerStatsModel.bandwidth.totalBytesLoaded.toInt())
 
-      // bufferedDuration
-      data.putInt("bufferedDuration", playerStatsModel.bufferedDuration.toInt())
+        // bufferedDuration
+        data.putInt("bufferedDuration", playerStatsModel.bufferedDuration.toInt())
 
-      // distanceFromLive
-      data.putInt("distanceFromLive", playerStatsModel.distanceFromLive.toInt())
+        // distanceFromLive
+        data.putInt("distanceFromLive", playerStatsModel.distanceFromLive.toInt())
 
-      // frameInfo
-      data.putInt("droppedFrameCount", playerStatsModel.frameInfo.droppedFrameCount)
+        // frameInfo
+        data.putInt("droppedFrameCount", playerStatsModel.frameInfo.droppedFrameCount)
 
-      // videoInfo
-      data.putInt("averageBitrate", playerStatsModel.videoInfo.averageBitrate)
-      data.putInt("videoHeight", playerStatsModel.videoInfo.videoHeight)
-      data.putInt("videoWidth", playerStatsModel.videoInfo.videoWidth)
+        // videoInfo
+        data.putInt("averageBitrate", playerStatsModel.videoInfo.averageBitrate)
+        data.putInt("videoHeight", playerStatsModel.videoInfo.videoHeight)
+        data.putInt("videoWidth", playerStatsModel.videoInfo.videoWidth)
 
-      sendHLSStatsEventToJS(HMSHLSPlayerConstants.ON_STATS_EVENT_UPDATE, data)
+        sendHLSStatsEventToJS(HMSHLSPlayerConstants.ON_STATS_EVENT_UPDATE, data)
+      }
     }
-  }
 
   init {
     val inflater = getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
@@ -109,6 +115,7 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     // getting Exoplayer View from above xml
     val localPlayerView = view.findViewById<PlayerView>(R.id.hls_view)
     playerView = localPlayerView
+    localPlayerView.useController = false
 
     val hmssdkCollection = context.getNativeModule(HMSManager::class.java)?.getHmsInstance()
     hmssdkInstance = hmssdkCollection?.get("12345")?.hmsSDK
@@ -122,6 +129,37 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
 
     // setting 100ms HLS Player on Exoplayer
     localPlayerView.player = localHmsHlsPlayer.getNativePlayer()
+
+    localPlayerView?.player?.addListener(
+      object : Player.Listener {
+        override fun onSurfaceSizeChanged(
+          width: Int,
+          height: Int,
+        ) {
+          super.onSurfaceSizeChanged(width, height)
+        }
+
+        override fun onVideoSizeChanged(videoSize: VideoSize) {
+          super.onVideoSizeChanged(videoSize)
+
+          if (videoSize.height != 0 && videoSize.width != 0) {
+            val width = videoSize.width.toDouble()
+            val height = videoSize.height.toDouble()
+
+            if (width >= height) {
+              playerView?.resizeMode = RESIZE_MODE_FIT
+            } else {
+              playerView?.resizeMode = RESIZE_MODE_ZOOM
+            }
+
+            val data = Arguments.createMap()
+            data.putString("state", "onVideoSizeChanged")
+            data.putDouble("aspectRatio", (width / height))
+            sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+          }
+        }
+      },
+    )
   }
 
   fun cleanup() {
@@ -138,13 +176,14 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
 
     val hlsStreamingState = this.hmssdkInstance?.getRoom()?.hlsStreamingState
 
-    val defaultURL: String? = hlsStreamingState?.let {
-      if (it.running) {
-        it.variants?.get(0)?.hlsStreamUrl
-      } else {
-        null
+    val defaultURL: String? =
+      hlsStreamingState?.let {
+        if (it.running) {
+          it.variants?.get(0)?.hlsStreamUrl
+        } else {
+          null
+        }
       }
-    }
 
     if (defaultURL !== null) {
       hmsHlsPlayer?.play(defaultURL)
@@ -215,7 +254,10 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     statsMonitorAttached = false
   }
 
-  private fun sendHLSPlaybackEventToJS(eventName: String, data: WritableMap) {
+  private fun sendHLSPlaybackEventToJS(
+    eventName: String,
+    data: WritableMap,
+  ) {
     val event: WritableMap = Arguments.createMap()
     event.putString("event", eventName)
     event.putMap("data", data)
@@ -224,7 +266,10 @@ class HMSHLSPlayer(context: ReactContext) : FrameLayout(context) {
     reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, HMSHLSPlayerConstants.HMS_HLS_PLAYBACK_EVENT, event)
   }
 
-  private fun sendHLSStatsEventToJS(eventName: String, data: WritableMap) {
+  private fun sendHLSStatsEventToJS(
+    eventName: String,
+    data: WritableMap,
+  ) {
     val event: WritableMap = Arguments.createMap()
     event.putString("event", eventName)
     event.putMap("data", data)

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

@@ -34,7 +34,11 @@ class HMSHLSPlayerManager : SimpleViewManager<HMSHLSPlayer>() {
     )
   }
 
-  override fun receiveCommand(root: HMSHLSPlayer, commandId: Int, args: ReadableArray?) {
+  override fun receiveCommand(
+    root: HMSHLSPlayer,
+    commandId: Int,
+    args: ReadableArray?,
+  ) {
     super.receiveCommand(root, commandId, args)
 
     when (commandId) {
@@ -81,17 +85,26 @@ class HMSHLSPlayerManager : SimpleViewManager<HMSHLSPlayer>() {
   }
 
   @ReactProp(name = "url")
-  fun setStreamURL(view: HMSHLSPlayer, data: String?) {
+  fun setStreamURL(
+    view: HMSHLSPlayer,
+    data: String?,
+  ) {
     view.play(data)
   }
 
   @ReactProp(name = "enableStats", defaultBoolean = false)
-  fun setEnableStats(view: HMSHLSPlayer, data: Boolean) {
+  fun setEnableStats(
+    view: HMSHLSPlayer,
+    data: Boolean,
+  ) {
     view.enableStats(data)
   }
 
   @ReactProp(name = "enableControls", defaultBoolean = false)
-  fun setEnableControls(view: HMSHLSPlayer, data: Boolean) {
+  fun setEnableControls(
+    view: HMSHLSPlayer,
+    data: Boolean,
+  ) {
     view.enableControls(data)
   }
 

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

@@ -29,7 +29,6 @@ import java.io.ByteArrayOutputStream
 import java.util.*
 
 object HMSHelper {
-
   fun areAllRequiredKeysAvailable(
     map: ReadableMap?,
     requiredKeys: Array<Pair<String, String>>,
@@ -96,14 +95,20 @@ object HMSHelper {
     return null
   }
 
-  fun getPeerFromPeerId(peerId: String?, room: HMSRoom?): HMSPeer? {
+  fun getPeerFromPeerId(
+    peerId: String?,
+    room: HMSRoom?,
+  ): HMSPeer? {
     if (peerId != null && room != null) {
       return HmsUtilities.getPeer(peerId, room)
     }
     return null
   }
 
-  fun getRemotePeerFromPeerId(peerId: String?, room: HMSRoom?): HMSRemotePeer? {
+  fun getRemotePeerFromPeerId(
+    peerId: String?,
+    room: HMSRoom?,
+  ): HMSRemotePeer? {
     if (peerId != null && room != null) {
       return HmsUtilities.getPeer(peerId, room) as? HMSRemotePeer
     }
@@ -128,7 +133,10 @@ object HMSHelper {
     return encodedRoles.toList()
   }
 
-  fun getRoleFromRoleName(role: String?, roles: List<HMSRole>?): HMSRole? {
+  fun getRoleFromRoleName(
+    role: String?,
+    roles: List<HMSRole>?,
+  ): HMSRole? {
     if (role != null && roles != null) {
       for (hmsRole in roles) {
         if (role == hmsRole.name) {
@@ -139,21 +147,30 @@ object HMSHelper {
     return null
   }
 
-  fun getRemoteAudioTrackFromTrackId(trackId: String?, room: HMSRoom?): HMSRemoteAudioTrack? {
+  fun getRemoteAudioTrackFromTrackId(
+    trackId: String?,
+    room: HMSRoom?,
+  ): HMSRemoteAudioTrack? {
     if (trackId != null && room != null) {
       return HmsUtilities.getAudioTrack(trackId, room) as? HMSRemoteAudioTrack
     }
     return null
   }
 
-  fun getRemoteVideoTrackFromTrackId(trackId: String?, room: HMSRoom?): HMSRemoteVideoTrack? {
+  fun getRemoteVideoTrackFromTrackId(
+    trackId: String?,
+    room: HMSRoom?,
+  ): HMSRemoteVideoTrack? {
     if (trackId != null && room != null) {
       return HmsUtilities.getVideoTrack(trackId, room) as? HMSRemoteVideoTrack
     }
     return null
   }
 
-  fun getTrackFromTrackId(trackId: String?, room: HMSRoom?): HMSTrack? {
+  fun getTrackFromTrackId(
+    trackId: String?,
+    room: HMSRoom?,
+  ): HMSTrack? {
     if (trackId != null && room != null) {
       return HmsUtilities.getTrack(trackId, room)
     }
@@ -334,7 +351,10 @@ object HMSHelper {
     return HMSVideoTrackSettings.CameraFacing.FRONT
   }
 
-  fun getHms(credentials: ReadableMap, hmsCollection: MutableMap<String, HMSRNSDK>): HMSRNSDK? {
+  fun getHms(
+    credentials: ReadableMap,
+    hmsCollection: MutableMap<String, HMSRNSDK>,
+  ): HMSRNSDK? {
     val id = credentials.getString("id")
 
     return if (id != null) {
@@ -372,9 +392,7 @@ object HMSHelper {
     return HMSHLSConfig(hlsMeetingUrlVariant, hlsRecordingConfig)
   }
 
-  private fun getHMSHLSMeetingURLVariants(
-    hmsMeetingURLVariants: ArrayList<HashMap<String, String>>?,
-  ): List<HMSHLSMeetingURLVariant> {
+  private fun getHMSHLSMeetingURLVariants(hmsMeetingURLVariants: ArrayList<HashMap<String, String>>?): List<HMSHLSMeetingURLVariant> {
     val meetingURLVariants = mutableListOf<HMSHLSMeetingURLVariant>()
     if (hmsMeetingURLVariants !== null) {
       for (variant in hmsMeetingURLVariants) {
@@ -408,9 +426,7 @@ object HMSHelper {
     return null
   }
 
-  private fun getHMSHLSMeetingURLVariant(
-    hmsMeetingURLVariant: HashMap<String, String>?,
-  ): HMSHLSMeetingURLVariant {
+  private fun getHMSHLSMeetingURLVariant(hmsMeetingURLVariant: HashMap<String, String>?): HMSHLSMeetingURLVariant {
     var meetingURLVariant = HMSHLSMeetingURLVariant("", "")
     if (hmsMeetingURLVariant !== null) {
       val meetingUrl = hmsMeetingURLVariant["meetingUrl"] as String
@@ -478,7 +494,7 @@ object HMSHelper {
             initEndpoint = credentials.getString("endpoint") as String,
             metadata = credentials.getString("metadata") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview"),
+              credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(
@@ -503,7 +519,7 @@ object HMSHelper {
             credentials.getString("authToken") as String,
             initEndpoint = credentials.getString("endpoint") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview"),
+              credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(
@@ -516,7 +532,7 @@ object HMSHelper {
             credentials.getString("authToken") as String,
             metadata = credentials.getString("metadata") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview"),
+              credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
       areAllRequiredKeysAvailable(credentials, arrayOf(Pair("endpoint", "String"))) -> {
@@ -544,7 +560,7 @@ object HMSHelper {
             credentials.getString("username") as String,
             credentials.getString("authToken") as String,
             captureNetworkQualityInPreview =
-            credentials.getBoolean("captureNetworkQualityInPreview"),
+              credentials.getBoolean("captureNetworkQualityInPreview"),
           )
       }
     }