bitmovin-player-react-native 0.44.1-alpha.0 → 1.0.0-alpha.0

package/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt

@@ -5,6 +5,8 @@ import com.bitmovin.analytics.api.AnalyticsConfig
 import com.bitmovin.analytics.api.CustomData
 import com.bitmovin.analytics.api.DefaultMetadata
 import com.bitmovin.analytics.api.SourceMetadata
+import com.bitmovin.player.reactnative.extensions.get
+import com.bitmovin.player.reactnative.extensions.set
 import com.bitmovin.player.api.BandwidthMeterType
 import com.bitmovin.player.api.DeviceDescription.DeviceName
 import com.bitmovin.player.api.ForceReuseVideoCodecReason
@@ -37,7 +39,6 @@ import com.bitmovin.player.api.media.AdaptationConfig
 import com.bitmovin.player.api.media.MediaTrackRole
 import com.bitmovin.player.api.media.MediaType
 import com.bitmovin.player.api.media.audio.AudioTrack
-import com.bitmovin.player.api.media.audio.quality.AudioQuality
 import com.bitmovin.player.api.media.subtitle.SubtitleTrack
 import com.bitmovin.player.api.media.thumbnail.Thumbnail
 import com.bitmovin.player.api.media.thumbnail.ThumbnailTrack
@@ -58,25 +59,21 @@ import com.bitmovin.player.api.ui.ScalingMode
 import com.bitmovin.player.api.ui.StyleConfig
 import com.bitmovin.player.api.ui.SurfaceType
 import com.bitmovin.player.api.ui.UiConfig
-import com.bitmovin.player.reactnative.BitmovinCastManagerOptions
 import com.bitmovin.player.reactnative.PictureInPictureConfig
 import com.bitmovin.player.reactnative.RNBufferLevels
 import com.bitmovin.player.reactnative.RNPlayerViewConfigWrapper
 import com.bitmovin.player.reactnative.RNStyleConfigWrapper
 import com.bitmovin.player.reactnative.UserInterfaceType
-import com.bitmovin.player.reactnative.extensions.get
+import com.bitmovin.player.reactnative.extensions.getArray
 import com.bitmovin.player.reactnative.extensions.getBooleanOrNull
 import com.bitmovin.player.reactnative.extensions.getDoubleOrNull
+import com.bitmovin.player.reactnative.extensions.getInt
+import com.bitmovin.player.reactnative.extensions.getMap
 import com.bitmovin.player.reactnative.extensions.getName
-import com.bitmovin.player.reactnative.extensions.mapToReactArray
-import com.bitmovin.player.reactnative.extensions.putBoolean
-import com.bitmovin.player.reactnative.extensions.putDouble
-import com.bitmovin.player.reactnative.extensions.putInt
-import com.bitmovin.player.reactnative.extensions.set
+import com.bitmovin.player.reactnative.extensions.getString
 import com.bitmovin.player.reactnative.extensions.toBase64DataUri
 import com.bitmovin.player.reactnative.extensions.toMap
 import com.bitmovin.player.reactnative.extensions.toMapList
-import com.bitmovin.player.reactnative.extensions.toReadableMap
 import com.bitmovin.player.reactnative.extensions.withArray
 import com.bitmovin.player.reactnative.extensions.withBoolean
 import com.bitmovin.player.reactnative.extensions.withDouble
@@ -84,13 +81,15 @@ import com.bitmovin.player.reactnative.extensions.withInt
 import com.bitmovin.player.reactnative.extensions.withMap
 import com.bitmovin.player.reactnative.extensions.withString
 import com.bitmovin.player.reactnative.extensions.withStringArray
-import com.facebook.react.bridge.*
 import java.util.UUID
 
 /**
- * Converts an arbitrary `json` to `PlayerConfig`.
+ * Filters out null values from a map to ensure compatibility with Expo modules
  */
-fun ReadableMap.toPlayerConfig(): PlayerConfig = PlayerConfig(key = getString("licenseKey")).apply {
+private fun Map<String, Any?>.filterNotNullValues(): Map<String, Any> =
+    this.filterValues { it != null }.mapValues { it.value!! }
+
+fun Map<String, Any?>.toPlayerConfig(): PlayerConfig = PlayerConfig(key = getString("licenseKey")).apply {
     withMap("playbackConfig") { playbackConfig = it.toPlaybackConfig() }
     withMap("styleConfig") { styleConfig = it.toStyleConfig() }
     withMap("tweaksConfig") { tweaksConfig = it.toTweaksConfig() }
@@ -102,72 +101,48 @@ fun ReadableMap.toPlayerConfig(): PlayerConfig = PlayerConfig(key = getString("l
     withMap("networkConfig") { networkConfig = it.toNetworkConfig() }
 }
 
-/**
- * Converts any JS object into a `BufferMediaTypeConfig` object.
- */
-fun ReadableMap.toBufferMediaTypeConfig(): BufferMediaTypeConfig = BufferMediaTypeConfig().apply {
+fun Map<String, Any?>.toBufferMediaTypeConfig(): BufferMediaTypeConfig = BufferMediaTypeConfig().apply {
     withDouble("forwardDuration") { forwardDuration = it }
 }
 
-/**
- * Converts any JS object into a `BufferConfig` object.
- */
-fun ReadableMap.toBufferConfig(): BufferConfig = BufferConfig().apply {
+fun Map<String, Any?>.toBufferConfig(): BufferConfig = BufferConfig().apply {
     withMap("audioAndVideo") { audioAndVideo = it.toBufferMediaTypeConfig() }
     withDouble("restartThreshold") { restartThreshold = it }
     withDouble("startupThreshold") { startupThreshold = it }
 }
 
-/**
- * Converts an arbitrary [ReadableMap] to a [RemoteControlConfig].
- */
-private fun ReadableMap.toRemoteControlConfig(): RemoteControlConfig = RemoteControlConfig().apply {
+private fun Map<String, Any?>.toRemoteControlConfig(): RemoteControlConfig = RemoteControlConfig().apply {
     withString("receiverStylesheetUrl") { receiverStylesheetUrl = it }
-    withMap("customReceiverConfig") { customReceiverConfig = it.toMap() }
+    withMap("customReceiverConfig") { customReceiverConfig = it.mapValues { entry -> entry.value as? String } }
     withBoolean("isCastEnabled") { isCastEnabled = it }
     withBoolean("sendManifestRequestsWithCredentials") { sendManifestRequestsWithCredentials = it }
     withBoolean("sendSegmentRequestsWithCredentials") { sendSegmentRequestsWithCredentials = it }
     withBoolean("sendDrmLicenseRequestsWithCredentials") { sendDrmLicenseRequestsWithCredentials = it }
 }
 
-/**
- * Converts an arbitrary `json` to `SourceOptions`.
- */
-fun ReadableMap.toSourceOptions(): SourceOptions = SourceOptions(
+fun Map<String, Any?>.toSourceOptions(): SourceOptions = SourceOptions(
     startOffset = getDoubleOrNull("startOffset"),
     startOffsetTimelineReference = getString("startOffsetTimelineReference")?.toTimelineReferencePoint(),
 )
 
-/**
- * Converts an arbitrary `json` to `TimelineReferencePoint`.
- */
 private fun String.toTimelineReferencePoint(): TimelineReferencePoint? = when (this) {
     "start" -> TimelineReferencePoint.Start
     "end" -> TimelineReferencePoint.End
     else -> null
 }
 
-/**
- * Converts an arbitrary `json` to `AdaptationConfig`.
- */
-private fun ReadableMap.toAdaptationConfig(): AdaptationConfig = AdaptationConfig().apply {
+private fun Map<String, Any?>.toAdaptationConfig(): AdaptationConfig = AdaptationConfig().apply {
     withInt("maxSelectableBitrate") { maxSelectableVideoBitrate = it }
     withInt("initialBandwidthEstimateOverride") { initialBandwidthEstimateOverride = it.toLong(); }
 }
 
-/**
- * Converts any JS object into a `PlaybackConfig` object.
- */
-fun ReadableMap.toPlaybackConfig(): PlaybackConfig = PlaybackConfig().apply {
+fun Map<String, Any?>.toPlaybackConfig(): PlaybackConfig = PlaybackConfig().apply {
     withBoolean("isAutoplayEnabled") { isAutoplayEnabled = it }
     withBoolean("isMuted") { isMuted = it }
     withBoolean("isTimeShiftEnabled") { isTimeShiftEnabled = it }
 }
 
-/**
- * Converts any JS object into a `StyleConfig` object.
- */
-fun ReadableMap.toStyleConfig(): StyleConfig = StyleConfig().apply {
+fun Map<String, Any?>.toStyleConfig(): StyleConfig = StyleConfig().apply {
     withBoolean("isUiEnabled") { isUiEnabled = it }
     getString("playerUiCss")?.takeIf { it.isNotEmpty() }?.let { playerUiCss = it }
     getString("supplementalPlayerUiCss")?.takeIf { it.isNotEmpty() }?.let { supplementalPlayerUiCss = it }
@@ -175,9 +150,6 @@ fun ReadableMap.toStyleConfig(): StyleConfig = StyleConfig().apply {
     withString("scalingMode") { scalingMode = ScalingMode.valueOf(it) }
 }
 
-/**
- * Converts any JS string into an `ForceReuseVideoCodecReason` enum value.
- */
 private fun String.toForceReuseVideoCodecReason(): ForceReuseVideoCodecReason? = when (this) {
     "ColorInfoMismatch" -> ForceReuseVideoCodecReason.ColorInfoMismatch
     "MaxInputSizeExceeded" -> ForceReuseVideoCodecReason.MaxInputSizeExceeded
@@ -185,10 +157,7 @@ private fun String.toForceReuseVideoCodecReason(): ForceReuseVideoCodecReason? =
     else -> null
 }
 
-/**
- * Converts any JS object into a `TweaksConfig` object.
- */
-fun ReadableMap.toTweaksConfig(): TweaksConfig = TweaksConfig().apply {
+fun Map<String, Any?>.toTweaksConfig(): TweaksConfig = TweaksConfig().apply {
     withDouble("timeChangedInterval") { timeChangedInterval = it }
     withInt("bandwidthEstimateWeightLimit") {
         bandwidthMeterType = BandwidthMeterType.Default(
@@ -217,39 +186,27 @@ fun ReadableMap.toTweaksConfig(): TweaksConfig = TweaksConfig().apply {
     }
 }
 
-/**
- * Converts any JS object into an `AdvertisingConfig` object.
- */
-fun ReadableMap.toAdvertisingConfig(): AdvertisingConfig? {
+fun Map<String, Any?>.toAdvertisingConfig(): AdvertisingConfig? {
     return AdvertisingConfig(
         getArray("schedule")?.toMapList()?.mapNotNull { it?.toAdItem() } ?: return null,
     )
 }
 
-/**
- * Converts any JS object into an `AdItem` object.
- */
-fun ReadableMap.toAdItem(): AdItem? {
+fun Map<String, Any?>.toAdItem(): AdItem? {
     return AdItem(
-        sources = getArray("sources") ?.toMapList()?.mapNotNull { it?.toAdSource() }?.toTypedArray() ?: return null,
+        sources = getArray("sources")?.toMapList()?.mapNotNull { it?.toAdSource() }?.toTypedArray() ?: return null,
         position = getString("position") ?: "pre",
         preloadOffset = getDoubleOrNull("preloadOffset") ?: 0.0,
     )
 }
 
-/**
- * Converts any JS object into an `AdSource` object.
- */
-fun ReadableMap.toAdSource(): AdSource? {
+fun Map<String, Any?>.toAdSource(): AdSource? {
     return AdSource(
         type = getString("type")?.toAdSourceType() ?: return null,
         tag = getString("tag") ?: return null,
     )
 }
 
-/**
- * Converts any JS string into an `AdSourceType` enum value.
- */
 private fun String.toAdSourceType(): AdSourceType? = when (this) {
     "bitmovin" -> AdSourceType.Bitmovin
     "ima" -> AdSourceType.Ima
@@ -258,10 +215,7 @@ private fun String.toAdSourceType(): AdSourceType? = when (this) {
     else -> null
 }
 
-/**
- * Converts an arbitrary `json` to `SourceConfig`.
- */
-fun ReadableMap.toSourceConfig(): SourceConfig? {
+fun Map<String, Any?>.toSourceConfig(): SourceConfig? {
     val url = getString("url") ?: return null
     val type = getString("type")?.toSourceType() ?: return null
     return SourceConfig(url, type).apply {
@@ -270,8 +224,8 @@ fun ReadableMap.toSourceConfig(): SourceConfig? {
         withString("poster") { posterSource = it }
         withBoolean("isPosterPersistent") { isPosterPersistent = it }
         withArray("subtitleTracks") { subtitleTracks ->
-            for (i in 0 until subtitleTracks.size()) {
-                subtitleTracks.getMap(i)?.toSubtitleTrack()?.let {
+            subtitleTracks.indices.forEach { subtitleTrack ->
+                subtitleTracks.getMap(subtitleTrack)?.toSubtitleTrack()?.let {
                     addSubtitleTrack(it)
                 }
             }
@@ -282,9 +236,6 @@ fun ReadableMap.toSourceConfig(): SourceConfig? {
     }
 }
 
-/**
- * Converts an arbitrary `json` to `SourceType`.
- */
 fun String.toSourceType(): SourceType? = when (this) {
     "dash" -> SourceType.Dash
     "hls" -> SourceType.Hls
@@ -293,293 +244,252 @@ fun String.toSourceType(): SourceType? = when (this) {
     else -> null
 }
 
-/**
- * Converts any given `Source` object into its `json` representation.
- */
-fun Source.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("duration", duration)
-    putBoolean("isActive", isActive)
-    putBoolean("isAttachedToPlayer", isAttachedToPlayer)
-    putInt("loadingState", loadingState.ordinal)
-    putMap("metadata", config.metadata?.toReadableMap())
-}
+fun Source.toJson(): Map<String, Any> = mapOf(
+    "duration" to duration,
+    "isActive" to isActive,
+    "isAttachedToPlayer" to isAttachedToPlayer,
+    "loadingState" to loadingState.ordinal,
+    "metadata" to (config.metadata ?: emptyMap<String, Any>()),
+).filterNotNullValues()
 
-/**
- * Converts any given `SeekPosition` object into its `json` representation.
- */
-fun SeekPosition.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("time", time)
-    putMap("source", source.toJson())
-}
+fun SeekPosition.toJson(): Map<String, Any> = mapOf(
+    "time" to time,
+    "source" to source.toJson(),
+).filterNotNullValues()
+
+fun SourceEvent.toJson(): Map<String, Any> {
+    val baseMap = mutableMapOf<String, Any?>(
+        "name" to getName(),
+        "timestamp" to timestamp.toDouble(),
+    )
 
-/**
- * Converts any given `SourceEvent` object into its `json` representation.
- */
-fun SourceEvent.toJson(): WritableMap {
-    val json = Arguments.createMap()
-    json.putString("name", getName())
-    json.putDouble("timestamp", timestamp.toDouble())
     when (this) {
         is SourceEvent.Load -> {
-            json.putMap("source", source.toJson())
+            baseMap["source"] = source.toJson()
         }
 
         is SourceEvent.Loaded -> {
-            json.putMap("source", source.toJson())
+            baseMap["source"] = source.toJson()
         }
 
         is SourceEvent.Error -> {
-            json.putInt("code", code.value)
-            json.putString("message", message)
+            baseMap["code"] = code.value
+            baseMap["message"] = message
         }
 
         is SourceEvent.Warning -> {
-            json.putInt("code", code.value)
-            json.putString("message", message)
+            baseMap["code"] = code.value
+            baseMap["message"] = message
         }
 
         is SourceEvent.AudioTrackAdded -> {
-            json.putMap("audioTrack", audioTrack.toJson())
+            baseMap["audioTrack"] = audioTrack.toJson()
         }
 
         is SourceEvent.AudioTrackChanged -> {
-            json.putMap("oldAudioTrack", oldAudioTrack?.toJson())
-            json.putMap("newAudioTrack", newAudioTrack?.toJson())
+            baseMap["oldAudioTrack"] = oldAudioTrack?.toJson()
+            baseMap["newAudioTrack"] = newAudioTrack?.toJson()
         }
 
         is SourceEvent.AudioTrackRemoved -> {
-            json.putMap("audioTrack", audioTrack.toJson())
+            baseMap["audioTrack"] = audioTrack.toJson()
         }
 
         is SourceEvent.SubtitleTrackAdded -> {
-            json.putMap("subtitleTrack", subtitleTrack.toJson())
+            baseMap["subtitleTrack"] = subtitleTrack.toJson()
         }
 
         is SourceEvent.SubtitleTrackRemoved -> {
-            json.putMap("subtitleTrack", subtitleTrack.toJson())
+            baseMap["subtitleTrack"] = subtitleTrack.toJson()
         }
 
         is SourceEvent.SubtitleTrackChanged -> {
-            json.putMap("oldSubtitleTrack", oldSubtitleTrack?.toJson())
-            json.putMap("newSubtitleTrack", newSubtitleTrack?.toJson())
+            baseMap["oldSubtitleTrack"] = oldSubtitleTrack?.toJson()
+            baseMap["newSubtitleTrack"] = newSubtitleTrack?.toJson()
         }
 
         is SourceEvent.DownloadFinished -> {
-            json.putDouble("downloadTime", downloadTime)
-            json.putString("requestType", downloadType.toString())
-            json.putInt("httpStatus", httpStatus)
-            json.putBoolean("isSuccess", isSuccess)
+            baseMap["downloadTime"] = downloadTime
+            baseMap["requestType"] = downloadType.toString()
+            baseMap["httpStatus"] = httpStatus
+            baseMap["isSuccess"] = isSuccess
             lastRedirectLocation?.let {
-                json.putString("lastRedirectLocation", it)
+                baseMap["lastRedirectLocation"] = it
             }
-            json.putDouble("size", size.toDouble())
-            json.putString("url", url)
+            baseMap["size"] = size.toDouble()
+            baseMap["url"] = url
         }
 
         is SourceEvent.VideoDownloadQualityChanged -> {
-            json.putMap("newVideoQuality", newVideoQuality?.toJson())
-            json.putMap("oldVideoQuality", oldVideoQuality?.toJson())
+            baseMap["newVideoQuality"] = newVideoQuality?.toJson()
+            baseMap["oldVideoQuality"] = oldVideoQuality?.toJson()
         }
 
         else -> {
             // Event is not supported yet or does not have any additional data
         }
     }
-    return json
+    return baseMap.filterNotNullValues()
 }
 
-/**
- * Converts any given `PlayerEvent` object into its `json` representation.
- */
-fun PlayerEvent.toJson(): WritableMap {
-    val json = Arguments.createMap()
-    json.putString("name", getName())
-    json.putDouble("timestamp", timestamp.toDouble())
+fun PlayerEvent.toJson(): Map<String, Any> {
+    val baseMap = mutableMapOf<String, Any?>(
+        "name" to getName(),
+        "timestamp" to timestamp.toDouble(),
+    )
+
     when (this) {
         is PlayerEvent.Error -> {
-            json.putInt("code", code.value)
-            json.putString("message", message)
+            baseMap["code"] = code.value
+            baseMap["message"] = message
         }
 
         is PlayerEvent.Warning -> {
-            json.putInt("code", code.value)
-            json.putString("message", message)
+            baseMap["code"] = code.value
+            baseMap["message"] = message
         }
 
         is PlayerEvent.Play -> {
-            json.putDouble("time", time)
+            baseMap["time"] = time
         }
 
         is PlayerEvent.Playing -> {
-            json.putDouble("time", time)
+            baseMap["time"] = time
         }
 
         is PlayerEvent.Paused -> {
-            json.putDouble("time", time)
+            baseMap["time"] = time
         }
 
         is PlayerEvent.TimeChanged -> {
-            json.putDouble("currentTime", time)
+            baseMap["currentTime"] = time
         }
 
         is PlayerEvent.Seek -> {
-            json.putMap("from", from.toJson())
-            json.putMap("to", to.toJson())
+            baseMap["from"] = from.toJson()
+            baseMap["to"] = to.toJson()
         }
 
         is PlayerEvent.TimeShift -> {
-            json.putDouble("position", position)
-            json.putDouble("targetPosition", target)
+            baseMap["position"] = position
+            baseMap["targetPosition"] = target
         }
 
         is PlayerEvent.PictureInPictureAvailabilityChanged -> {
-            json.putBoolean("isPictureInPictureAvailable", isPictureInPictureAvailable)
+            baseMap["isPictureInPictureAvailable"] = isPictureInPictureAvailable
         }
 
         is PlayerEvent.AdBreakFinished -> {
-            json.putMap("adBreak", adBreak?.toJson())
+            baseMap["adBreak"] = adBreak?.toJson()
         }
 
         is PlayerEvent.AdBreakStarted -> {
-            json.putMap("adBreak", adBreak?.toJson())
+            baseMap["adBreak"] = adBreak?.toJson()
         }
 
         is PlayerEvent.AdClicked -> {
-            json.putString("clickThroughUrl", clickThroughUrl)
+            baseMap["clickThroughUrl"] = clickThroughUrl
         }
 
         is PlayerEvent.AdError -> {
-            json.putInt("code", code)
-            json.putString("message", message)
-            json.putMap("adConfig", adConfig?.toJson())
-            json.putMap("adItem", adItem?.toJson())
+            baseMap["code"] = code
+            baseMap["message"] = message
+            baseMap["adConfig"] = adConfig?.toJson()
+            baseMap["adItem"] = adItem?.toJson()
         }
 
         is PlayerEvent.AdFinished -> {
-            json.putMap("ad", ad?.toJson())
+            baseMap["ad"] = ad?.toJson()
         }
 
         is PlayerEvent.AdManifestLoad -> {
-            json.putMap("adBreak", adBreak?.toJson())
-            json.putMap("adConfig", adConfig.toJson())
+            baseMap["adBreak"] = adBreak?.toJson()
+            baseMap["adConfig"] = adConfig.toJson()
         }
 
         is PlayerEvent.AdManifestLoaded -> {
-            json.putMap("adBreak", adBreak?.toJson())
-            json.putMap("adConfig", adConfig.toJson())
-            json.putDouble("downloadTime", downloadTime.toDouble())
+            baseMap["adBreak"] = adBreak?.toJson()
+            baseMap["adConfig"] = adConfig.toJson()
+            baseMap["downloadTime"] = downloadTime.toDouble()
         }
 
         is PlayerEvent.AdQuartile -> {
-            json.putString("quartile", quartile.toJson())
+            baseMap["quartile"] = quartile.toJson()
         }
 
         is PlayerEvent.AdScheduled -> {
-            json.putInt("numberOfAds", numberOfAds)
+            baseMap["numberOfAds"] = numberOfAds
         }
 
         is PlayerEvent.AdSkipped -> {
-            json.putMap("ad", ad?.toJson())
+            baseMap["ad"] = ad?.toJson()
         }
 
         is PlayerEvent.AdStarted -> {
-            json.putMap("ad", ad?.toJson())
-            json.putString("clickThroughUrl", clickThroughUrl)
-            json.putString("clientType", clientType?.toJson())
-            json.putDouble("duration", duration)
-            json.putInt("indexInQueue", indexInQueue)
-            json.putString("position", position)
-            json.putDouble("skipOffset", skipOffset)
-            json.putDouble("timeOffset", timeOffset)
+            baseMap["ad"] = ad?.toJson()
+            baseMap["clickThroughUrl"] = clickThroughUrl
+            baseMap["clientType"] = clientType?.toJson()
+            baseMap["duration"] = duration
+            baseMap["indexInQueue"] = indexInQueue
+            baseMap["position"] = position
+            baseMap["skipOffset"] = skipOffset
+            baseMap["timeOffset"] = timeOffset
         }
 
         is PlayerEvent.VideoPlaybackQualityChanged -> {
-            json.putMap("newVideoQuality", newVideoQuality?.toJson())
-            json.putMap("oldVideoQuality", oldVideoQuality?.toJson())
+            baseMap["newVideoQuality"] = newVideoQuality?.toJson()
+            baseMap["oldVideoQuality"] = oldVideoQuality?.toJson()
         }
 
         is PlayerEvent.CastWaitingForDevice -> {
-            json.putMap("castPayload", castPayload.toJson())
+            baseMap["castPayload"] = castPayload.toJson()
         }
 
         is PlayerEvent.CastStarted -> {
-            json.putString("deviceName", deviceName)
+            baseMap["deviceName"] = deviceName
         }
 
         is PlayerEvent.CueEnter -> {
-            json.putDouble("start", start)
-            json.putDouble("end", end)
-            json.putString("text", text)
-            json.putString("image", image?.toBase64DataUri())
+            baseMap["start"] = start
+            baseMap["end"] = end
+            baseMap["text"] = text
+            baseMap["image"] = image?.toBase64DataUri()
         }
 
         is PlayerEvent.CueExit -> {
-            json.putDouble("start", start)
-            json.putDouble("end", end)
-            json.putString("text", text)
-            json.putString("image", image?.toBase64DataUri())
+            baseMap["start"] = start
+            baseMap["end"] = end
+            baseMap["text"] = text
+            baseMap["image"] = image?.toBase64DataUri()
         }
 
         else -> {
             // Event is not supported yet or does not have any additional data
         }
     }
-    return json
+    return baseMap.filterNotNullValues()
 }
 
-/**
- * Converts an arbitrary `json` into [BitmovinCastManagerOptions].
- */
-fun ReadableMap.toCastOptions(): BitmovinCastManagerOptions = BitmovinCastManagerOptions(
-    applicationId = getString("applicationId"),
-    messageNamespace = getString("messageNamespace"),
-)
-
-/**
- * Converts an arbitrary `json` to `WidevineConfig`.
- */
-fun ReadableMap.toWidevineConfig(): WidevineConfig? = getMap("widevine")?.run {
+fun Map<String, Any?>.toWidevineConfig(): WidevineConfig? = getMap("widevine")?.run {
     WidevineConfig(getString("licenseUrl")).apply {
         withString("preferredSecurityLevel") { preferredSecurityLevel = it }
         withBoolean("shouldKeepDrmSessionsAlive") { shouldKeepDrmSessionsAlive = it }
-        withMap("httpHeaders") { httpHeaders = it.toMap<String>().toMutableMap() }
+        withMap("httpHeaders") { httpHeaders = it.mapValues { entry -> entry.value as String }.toMutableMap() }
     }
 }
 
-/**
- * Converts an `url` string into a `ThumbnailsTrack`.
- */
 fun String.toThumbnailTrack(): ThumbnailTrack = ThumbnailTrack(this)
 
-/**
- * Converts any `AudioTrack` into its json representation.
- */
-fun AudioTrack.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("url", url)
-    putString("label", label)
-    putBoolean("isDefault", isDefault)
-    putString("identifier", id)
-    putString("language", language)
-    putArray("roles", roles.mapToReactArray { it.toJson() })
-    putArray("qualities", qualities.mapToReactArray { it.toJson() })
-}
-
-/**
- * Converts any `AudioQuality` into its json representation.
- */
-fun AudioQuality.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("id", id)
-    putString("label", label)
-    putInt("bitrate", bitrate)
-    putInt("averageBitrate", averageBitrate)
-    putInt("peakBitrate", peakBitrate)
-    putString("codec", codec)
-}
+fun AudioTrack.toJson(): Map<String, Any> = mapOf(
+    "url" to url,
+    "label" to label,
+    "isDefault" to isDefault,
+    "identifier" to id,
+    "language" to language,
+    "roles" to roles.map { it.toJson() },
+).filterNotNullValues()
 
-/**
- * Converts an arbitrary `json` into a `SubtitleTrack`.
- */
-fun ReadableMap.toSubtitleTrack(): SubtitleTrack? {
+fun Map<String, Any?>.toSubtitleTrack(): SubtitleTrack? {
     return SubtitleTrack(
         url = getString("url") ?: return null,
         label = getString("label") ?: return null,
@@ -591,92 +501,62 @@ fun ReadableMap.toSubtitleTrack(): SubtitleTrack? {
     )
 }
 
-/**
- * Converts any subtitle format name in its mime type representation.
- */
 private fun String.toSubtitleMimeType(): String = when (this) {
     "srt" -> "application/x-subrip"
     "ttml" -> "application/ttml+xml"
     else -> "text/$this"
 }
 
-/**
- * Converts any `SubtitleTrack` into its json representation.
- */
-fun SubtitleTrack.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("url", url)
-    putString("label", label)
-    putBoolean("isDefault", isDefault)
-    putString("identifier", id)
-    putString("language", language)
-    putBoolean("isForced", isForced)
-    putString("format", mimeType?.textMimeTypeToJson())
-    putArray("roles", roles.mapToReactArray { it.toJson() })
-}
+fun SubtitleTrack.toJson(): Map<String, Any> = mapOf(
+    "url" to url,
+    "label" to label,
+    "isDefault" to isDefault,
+    "identifier" to id,
+    "language" to language,
+    "isForced" to isForced,
+    "format" to mimeType?.textMimeTypeToJson(),
+    "roles" to roles.map { it.toJson() },
+).filterNotNullValues()
 
-/**
- * Converts any subtitle track mime type into its json representation (file format value).
- */
 private fun String.textMimeTypeToJson(): String = split("/").last()
 
-/**
- * Converts any `AdBreak` object into its json representation.
- */
-fun AdBreak.toJson(): WritableMap = Arguments.createMap().apply {
-    putArray("ads", ads.mapToReactArray { it.toJson() })
-    putString("id", id)
-    putDouble("scheduleTime", scheduleTime)
-}
-
-/**
- * Converts any `Ad` object into its json representation.
- */
-fun Ad.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("clickThroughUrl", clickThroughUrl)
-    putMap("data", data?.toJson())
-    putInt("height", height)
-    putString("id", id)
-    putBoolean("isLinear", isLinear)
-    putString("mediaFileUrl", mediaFileUrl)
-    putInt("width", width)
-}
-
-/**
- * Converts any `AdData` object into its json representation.
- */
-fun AdData.toJson(): WritableMap = Arguments.createMap().apply {
-    putInt("bitrate", bitrate)
-    putInt("maxBitrate", maxBitrate)
-    putString("mimeType", mimeType)
-    putInt("minBitrate", minBitrate)
-}
-
-/**
- * Converts any `AdConfig` object into its json representation.
- */
-fun AdConfig.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("replaceContentDuration", replaceContentDuration)
-}
+fun AdBreak.toJson(): Map<String, Any> = mapOf(
+    "ads" to ads.map { it.toJson() },
+    "id" to id,
+    "scheduleTime" to scheduleTime,
+)
 
-/**
- * Converts any `AdItem` object into its json representation.
- */
-fun AdItem.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("position", position)
-    putArray("sources", sources.toList().mapToReactArray { it.toJson() })
-}
+fun Ad.toJson(): Map<String, Any> = mapOf(
+    "clickThroughUrl" to clickThroughUrl,
+    "data" to data?.toJson(),
+    "height" to height,
+    "id" to id,
+    "isLinear" to isLinear,
+    "mediaFileUrl" to mediaFileUrl,
+    "width" to width,
+).filterNotNullValues()
+
+fun AdData.toJson(): Map<String, Any> = mapOf<String, Any?>(
+    "bitrate" to bitrate,
+    "maxBitrate" to maxBitrate,
+    "mimeType" to mimeType,
+    "minBitrate" to minBitrate,
+).filterNotNullValues()
+
+fun AdConfig.toJson(): Map<String, Any> = mapOf<String, Any?>(
+    "replaceContentDuration" to replaceContentDuration,
+).filterNotNullValues()
+
+fun AdItem.toJson(): Map<String, Any> = mapOf(
+    "position" to position,
+    "sources" to sources.toList().map { it.toJson() },
+)
 
-/**
- * Converts any `AdSource` object into its json representation.
- */
-fun AdSource.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("tag", tag)
-    putString("type", type.toJson())
-}
+fun AdSource.toJson(): Map<String, Any> = mapOf(
+    "tag" to tag,
+    "type" to type.toJson(),
+)
 
-/**
- * Converts any `AdSourceType` value into its json representation.
- */
 fun AdSourceType.toJson(): String = when (this) {
     AdSourceType.Bitmovin -> "bitmovin"
     AdSourceType.Ima -> "ima"
@@ -684,38 +564,26 @@ fun AdSourceType.toJson(): String = when (this) {
     AdSourceType.Progressive -> "progressive"
 }
 
-/**
- * Converts any `AdQuartile` value into its json representation.
- */
 fun AdQuartile.toJson(): String = when (this) {
     AdQuartile.FirstQuartile -> "first"
     AdQuartile.MidPoint -> "mid_point"
     AdQuartile.ThirdQuartile -> "third"
 }
 
-/**
- * Converts an arbitrary json object into a `BitmovinAnalyticsConfig`.
- */
-fun ReadableMap.toAnalyticsConfig(): AnalyticsConfig? = getString("licenseKey")
+fun Map<String, Any?>.toAnalyticsConfig(): AnalyticsConfig? = getString("licenseKey")
     ?.let { AnalyticsConfig.Builder(it) }
     ?.apply {
         withBoolean("adTrackingDisabled") { setAdTrackingDisabled(it) }
         withBoolean("randomizeUserId") { setRandomizeUserId(it) }
     }?.build()
 
-/**
- * Converts an arbitrary json object into an analytics `DefaultMetadata`.
- */
-fun ReadableMap.toAnalyticsDefaultMetadata(): DefaultMetadata = DefaultMetadata.Builder().apply {
+fun Map<String, Any?>.toAnalyticsDefaultMetadata(): DefaultMetadata = DefaultMetadata.Builder().apply {
     setCustomData(toAnalyticsCustomData())
     withString("cdnProvider") { setCdnProvider(it) }
     withString("customUserId") { setCustomUserId(it) }
 }.build()
 
-/**
- * Converts an arbitrary json object into an analytics `CustomData`.
- */
-fun ReadableMap.toAnalyticsCustomData(): CustomData = CustomData.Builder().apply {
+fun Map<String, Any?>.toAnalyticsCustomData(): CustomData = CustomData.Builder().apply {
     for (n in 1..30) {
         this[n] = getString("customData$n")
     }
@@ -724,17 +592,16 @@ fun ReadableMap.toAnalyticsCustomData(): CustomData = CustomData.Builder().apply
     }
 }.build()
 
-/**
- * Converts an arbitrary analytics `CustomData` object into a JS value.
- */
-fun CustomData.toJson(): WritableMap = Arguments.createMap().also { json ->
+fun CustomData.toJson(): Map<String, Any> {
+    val map = mutableMapOf<String, Any?>()
     for (n in 1..30) {
-        json.putStringIfNotNull("customData$n", this[n])
+        this[n]?.let { map["customData$n"] = it }
     }
-    json.putStringIfNotNull("experimentName", experimentName)
+    experimentName?.let { map["experimentName"] = it }
+    return map.filterNotNullValues()
 }
 
-fun ReadableMap.toAnalyticsSourceMetadata(): SourceMetadata = SourceMetadata(
+fun Map<String, Any?>.toAnalyticsSourceMetadata(): SourceMetadata = SourceMetadata(
     title = getString("title"),
     videoId = getString("videoId"),
     cdnProvider = getString("cdnProvider"),
@@ -743,59 +610,52 @@ fun ReadableMap.toAnalyticsSourceMetadata(): SourceMetadata = SourceMetadata(
     customData = toAnalyticsCustomData(),
 )
 
-fun SourceMetadata.toJson(): ReadableMap = customData.toJson().also {
-    it.putString("title", title)
-    it.putString("videoId", videoId)
-    it.putString("cdnProvider", cdnProvider)
-    it.putString("path", path)
-    it.putBoolean("isLive", isLive)
-}
-
-/**
- * Converts any `VideoQuality` value into its json representation.
- */
-fun VideoQuality.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("id", id)
-    putString("label", label)
-    putInt("bitrate", bitrate)
-    putString("codec", codec)
-    putDouble("frameRate", frameRate.toDouble())
-    putInt("height", height)
-    putInt("width", width)
-}
-
-/**
- * Converts any `OfflineOptionEntry` into its json representation.
- */
-fun OfflineOptionEntry.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("id", id)
-    putString("language", language)
-}
-
-/**
- * Converts any `OfflineContentOptions` into its json representation.
- */
-fun OfflineContentOptions.toJson(): WritableMap = Arguments.createMap().apply {
-    putArray("audioOptions", audioOptions.mapToReactArray { it.toJson() })
-    putArray("textOptions", textOptions.mapToReactArray { it.toJson() })
-}
+fun SourceMetadata.toJson(): Map<String, Any> {
+    val map = customData.toJson().toMutableMap<String, Any?>()
+    map["title"] = title
+    map["videoId"] = videoId
+    map["cdnProvider"] = cdnProvider
+    map["path"] = path
+    map["isLive"] = isLive
+    return map.filterNotNullValues()
+}
+
+fun VideoQuality.toJson(): Map<String, Any> = mapOf<String, Any?>(
+    "id" to id,
+    "label" to label,
+    "bitrate" to bitrate,
+    "codec" to codec,
+    "frameRate" to frameRate.toDouble(),
+    "height" to height,
+    "width" to width,
+).filterNotNullValues()
+
+fun OfflineOptionEntry.toJson(): Map<String, Any> = mapOf(
+    "id" to id,
+    "language" to language,
+).filterNotNullValues()
+
+fun OfflineContentOptions.toJson(): Map<String, Any> = mapOf(
+    "audioOptions" to audioOptions.map { it.toJson() },
+    "textOptions" to textOptions.map { it.toJson() },
+)
 
-fun Thumbnail.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("start", start)
-    putDouble("end", end)
-    putString("text", text)
-    putString("url", uri.toString())
-    putInt("x", x)
-    putInt("y", y)
-    putInt("width", width)
-    putInt("height", height)
-}
+fun Thumbnail.toJson(): Map<String, Any> = mapOf(
+    "start" to start,
+    "end" to end,
+    "text" to text,
+    "url" to uri.toString(),
+    "x" to x,
+    "y" to y,
+    "width" to width,
+    "height" to height,
+)
 
-fun ReadableMap.toPictureInPictureConfig(): PictureInPictureConfig = PictureInPictureConfig(
+fun Map<String, Any?>.toPictureInPictureConfig(): PictureInPictureConfig = PictureInPictureConfig(
     isEnabled = getBooleanOrNull("isEnabled") ?: false,
 )
 
-fun ReadableMap.toPlayerViewConfig(): PlayerViewConfig = PlayerViewConfig(
+fun Map<String, Any?>.toPlayerViewConfig(): PlayerViewConfig = PlayerViewConfig(
     uiConfig = getMap("uiConfig")?.toUiConfig() ?: UiConfig.WebUi(),
     hideFirstFrame = getBooleanOrNull("hideFirstFrame") ?: false,
     surfaceType = getString("surfaceType")?.toSurfaceType() ?: SurfaceType.SurfaceView,
@@ -807,7 +667,7 @@ private fun String.toSurfaceType(): SurfaceType? = when (this) {
     else -> null
 }
 
-private fun ReadableMap.toUiConfig(): UiConfig {
+private fun Map<String, Any?>.toUiConfig(): UiConfig {
     val variant = toVariant() ?: UiConfig.WebUi.Variant.SmallScreenUi
     val focusUiOnInitialization = getBooleanOrNull("focusUiOnInitialization")
     val defaultFocusUiOnInitialization = variant == UiConfig.WebUi.Variant.TvUi
@@ -819,7 +679,7 @@ private fun ReadableMap.toUiConfig(): UiConfig {
     )
 }
 
-private fun ReadableMap.toVariant(): UiConfig.WebUi.Variant? {
+private fun Map<String, Any?>.toVariant(): UiConfig.WebUi.Variant? {
     val uiManagerFactoryFunction = getMap("variant")?.getString("uiManagerFactoryFunction") ?: return null
 
     return when (uiManagerFactoryFunction) {
@@ -829,36 +689,36 @@ private fun ReadableMap.toVariant(): UiConfig.WebUi.Variant? {
     }
 }
 
-private fun ReadableMap.toUserInterfaceTypeFromPlayerConfig(): UserInterfaceType? =
+private fun Map<String, Any?>.toUserInterfaceTypeFromPlayerConfig(): UserInterfaceType? =
     when (getMap("styleConfig")?.getString("userInterfaceType")) {
         "Subtitle" -> UserInterfaceType.Subtitle
         "Bitmovin" -> UserInterfaceType.Bitmovin
         else -> null
     }
 
-/**
- * Converts the [this@toRNPlayerViewConfigWrapper] to a `RNPlayerViewConfig` object.
- */
-fun ReadableMap.toRNPlayerViewConfigWrapper() = RNPlayerViewConfigWrapper(
+fun String.toUserInterfaceType(): UserInterfaceType? = when (this) {
+    "Subtitle" -> UserInterfaceType.Subtitle
+    "Bitmovin" -> UserInterfaceType.Bitmovin
+    else -> null
+}
+
+fun Map<String, Any?>.toRNPlayerViewConfigWrapper() = RNPlayerViewConfigWrapper(
     playerViewConfig = toPlayerViewConfig(),
     pictureInPictureConfig = getMap("pictureInPictureConfig")?.toPictureInPictureConfig(),
 )
 
-fun ReadableMap.toRNStyleConfigWrapperFromPlayerConfig(): RNStyleConfigWrapper? {
+fun Map<String, Any?>.toRNStyleConfigWrapperFromPlayerConfig(): RNStyleConfigWrapper? {
     return RNStyleConfigWrapper(
         styleConfig = toStyleConfig(),
         userInterfaceType = toUserInterfaceTypeFromPlayerConfig() ?: return null,
     )
 }
 
-/**
- * Converts any JS object into a [LiveConfig] object.
- */
-fun ReadableMap.toLiveConfig(): LiveConfig = LiveConfig().apply {
+fun Map<String, Any?>.toLiveConfig(): LiveConfig = LiveConfig().apply {
     withDouble("minTimeshiftBufferDepth") { minTimeShiftBufferDepth = it }
 }
 
-fun ReadableMap.toHttpRequest(): HttpRequest? {
+fun Map<String, Any?>.toHttpRequest(): HttpRequest? {
     return HttpRequest(
         getString("url") ?: return null,
         getMap("headers")?.toMap(),
@@ -873,7 +733,7 @@ private fun ByteArray.toBase64String(): String {
 
 private fun String.toByteArrayFromBase64(): ByteArray = Base64.decode(this, Base64.NO_WRAP)
 
-fun ReadableMap.toHttpResponse(): HttpResponse? {
+fun Map<String, Any?>.toHttpResponse(): HttpResponse? {
     return HttpResponse(
         httpRequest = getMap("request")?.toHttpRequest() ?: return null,
         url = getString("url") ?: return null,
@@ -883,65 +743,54 @@ fun ReadableMap.toHttpResponse(): HttpResponse? {
     )
 }
 
-fun ReadableMap.toNetworkConfig(): NetworkConfig = NetworkConfig()
+fun Map<String, Any?>.toNetworkConfig(): NetworkConfig = NetworkConfig()
 
-fun HttpRequest.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("url", url)
-    putMap("headers", headers?.toReadableMap())
-    putString("body", body?.toBase64String())
-    putString("method", method)
-}
+fun HttpRequest.toJson(): Map<String, Any> = mapOf(
+    "url" to url,
+    "headers" to headers,
+    "body" to body?.toBase64String(),
+    "method" to method,
+).filterNotNullValues()
 
-fun HttpResponse.toJson(): WritableMap = Arguments.createMap().apply {
-    putMap("request", httpRequest.toJson())
-    putString("url", url)
-    putInt("status", status)
-    putMap("headers", headers.toReadableMap())
-    putString("body", body.toBase64String())
-}
+fun HttpResponse.toJson(): Map<String, Any> = mapOf(
+    "request" to httpRequest.toJson(),
+    "url" to url,
+    "status" to status,
+    "headers" to headers,
+    "body" to body.toBase64String(),
+)
 
 fun HttpRequestType.toJson(): String = toString()
 
-/**
- * Converts any [MediaType] value into its json representation.
- */
 fun MediaType.toJson(): String = when (this) {
     MediaType.Audio -> "audio"
     MediaType.Video -> "video"
 }
 
-/**
- * Converts any [BufferType] value into its json representation.
- */
 fun BufferType.toJson(): String = when (this) {
     BufferType.ForwardDuration -> "forwardDuration"
     BufferType.BackwardDuration -> "backwardDuration"
 }
 
-fun BufferLevel.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("level", level)
-    putDouble("targetLevel", targetLevel)
-    putString("media", media.toJson())
-    putString("type", type.toJson())
-}
+fun BufferLevel.toJson(): Map<String, Any> = mapOf(
+    "level" to level,
+    "targetLevel" to targetLevel,
+    "media" to media.toJson(),
+    "type" to type.toJson(),
+)
 
-fun RNBufferLevels.toJson(): WritableMap = Arguments.createMap().apply {
-    putMap("audio", audio.toJson())
-    putMap("video", video.toJson())
-}
+fun RNBufferLevels.toJson(): Map<String, Any> = mapOf(
+    "audio" to audio.toJson(),
+    "video" to video.toJson(),
+)
 
-/**
- * Maps a JS string into the corresponding [BufferType] value.
- */
-fun String.toBufferType(): BufferType? = when (this) {
-    "forwardDuration" -> BufferType.ForwardDuration
-    "backwardDuration" -> BufferType.BackwardDuration
-    else -> null
+// Extension function to convert string to BufferType
+fun String.toBufferTypeOrThrow(): BufferType = when (this.lowercase()) {
+    "forwardduration" -> BufferType.ForwardDuration
+    "backwardduration" -> BufferType.BackwardDuration
+    else -> throw IllegalArgumentException("Unknown buffer type: $this")
 }
 
-/**
- * Maps a JS string into the corresponding [MediaType] value.
- */
 fun String.toMediaType(): MediaType? = when (this) {
     "audio" -> MediaType.Audio
     "video" -> MediaType.Video
@@ -952,57 +801,48 @@ data class MediaControlConfig(
     var isEnabled: Boolean = true,
 )
 
-fun ReadableMap.toMediaControlConfig(): MediaControlConfig = MediaControlConfig().apply {
+fun Map<String, Any?>.toMediaControlConfig(): MediaControlConfig = MediaControlConfig().apply {
     withBoolean("isEnabled") { isEnabled = it }
 }
 
-/**
- * Converts a [CastPayload] object into its JS representation.
- */
-private fun CastPayload.toJson(): WritableMap = Arguments.createMap().apply {
-    putDouble("currentTime", currentTime)
-    putString("deviceName", deviceName)
-    putString("type", type)
-}
-
-private fun WritableMap.putStringIfNotNull(name: String, value: String?) = value?.let { putString(name, value) }
+private fun CastPayload.toJson(): Map<String, Any> = mapOf<String, Any?>(
+    "currentTime" to currentTime,
+    "deviceName" to deviceName,
+    "type" to type,
+).filterNotNullValues()
 
-fun DecoderContext.toJson(): ReadableMap = Arguments.createMap().apply {
-    putString("mediaType", mediaType.name)
-    putBoolean("isAd", isAd)
-}
+fun DecoderContext.toJson(): Map<String, Any> = mapOf(
+    "mediaType" to mediaType.name,
+    "isAd" to isAd,
+)
 
-fun List<MediaCodecInfo>.toJson(): ReadableArray = Arguments.createArray().apply {
-    forEach {
-        pushMap(it.toJson())
-    }
-}
+fun List<MediaCodecInfo>.toJson(): List<Map<String, Any>> = map { it.toJson() }
 
-fun MediaCodecInfo.toJson(): ReadableMap = Arguments.createMap().apply {
-    putString("name", name)
-    putBoolean("isSoftware", isSoftware)
-}
+fun MediaCodecInfo.toJson(): Map<String, Any> = mapOf(
+    "name" to name,
+    "isSoftware" to isSoftware,
+)
 
-fun ReadableArray.toMediaCodecInfoList(): List<MediaCodecInfo> {
-    if (size() <= 0) {
+fun List<Any?>.toMediaCodecInfoList(): List<MediaCodecInfo> {
+    if (isEmpty()) {
         return emptyList()
     }
     val mediaCodecInfoList = mutableListOf<MediaCodecInfo>()
-    (0 until size()).forEach {
+    indices.forEach {
         val info = getMap(it)?.toMediaCodecInfo() ?: return@forEach
         mediaCodecInfoList.add(info)
     }
     return mediaCodecInfoList
 }
 
-fun ReadableMap.toMediaCodecInfo(): MediaCodecInfo? {
+fun Map<String, Any?>.toMediaCodecInfo(): MediaCodecInfo? {
     val name = getString("name") ?: return null
     val isSoftware = getBooleanOrNull("isSoftware") ?: return null
     return MediaCodecInfo(name, isSoftware)
 }
 
-fun MediaTrackRole.toJson(): WritableMap = Arguments.createMap().apply {
-    putString("id", id)
-    putString("schemeIdUri", schemeIdUri)
-    putString("value", value)
-}
+fun MediaTrackRole.toJson(): Map<String, Any> = mapOf(
+    "id" to id,
+    "schemeIdUri" to schemeIdUri,
+    "value" to value,
+).filterNotNullValues()