fix issues after gradle and kotlin updates

aws · Sep 3, 2024 · 46d1e6b · 46d1e6b
1 parent 7af48a3
commit 46d1e6b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...zonaws/services/chime/sdk/meetings/audiovideo/video/capture/DefaultCameraCaptureSource.kt b/...zonaws/services/chime/sdk/meetings/audiovideo/video/capture/DefaultCameraCaptureSource.kt
@@ -213,7 +213,7 @@ class DefaultCameraCaptureSource @JvmOverloads constructor(
         val maxFps: Int = 30
 
         val chosenCaptureFormat: VideoCaptureFormat? =
-            MediaDevice.listSupportedVideoCaptureFormats(cameraManager, device, maxFps, maxWidth, maxHeight).minBy { format ->
+            MediaDevice.listSupportedVideoCaptureFormats(cameraManager, device, maxFps, maxWidth, maxHeight).minByOrNull { format ->
                 abs(format.width - this.format.width) + abs(format.height - this.format.height)
             }
         val surfaceTextureFormat: VideoCaptureFormat = chosenCaptureFormat ?: run {
@@ -390,11 +390,11 @@ class DefaultCameraCaptureSource @JvmOverloads constructor(
             // Pick range with max closest to but not exceeding the set max framerate
             val bestFpsRange = fpsRanges
                     .filter { it.upper <= this.format.maxFps }
-                    .minBy { this.format.maxFps - it.upper }
+                    .minByOrNull { this.format.maxFps - it.upper }
                     ?: run {
                         logger.warn(TAG, "No FPS ranges below set max FPS")
                         // Just fall back to the closest
-                        return@run fpsRanges.minBy { abs(this.format.maxFps - it.upper) }
+                        return@run fpsRanges.minByOrNull { abs(this.format.maxFps - it.upper) }
                     } ?: run {
                         logger.error(TAG, "No valid FPS ranges")
                         handleCameraCaptureFail(CaptureSourceError.ConfigurationFailure)

diff --git a/...n-chime-sdk/src/main/java/com/amazonaws/services/chime/sdk/meetings/device/MediaDevice.kt b/...n-chime-sdk/src/main/java/com/amazonaws/services/chime/sdk/meetings/device/MediaDevice.kt
@@ -80,7 +80,7 @@ data class MediaDevice(
             val characteristics = cameraManager.getCameraCharacteristics(mediaDevice.id ?: return emptyList())
             val fps = characteristics.get(
                 CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES
-            )?.map { it.upper }?.filter { it <= maxVideoFps }?.max() ?: DEFAULT_MAX_VIDEO_FORMAT_FPS
+            )?.map { it.upper }?.filter { it <= maxVideoFps }?.maxOrNull() ?: DEFAULT_MAX_VIDEO_FORMAT_FPS
 
             val streamMap =
                     characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)

diff --git a/...va/com/amazonaws/services/chime/sdk/meetings/internal/audio/DefaultAudioClientObserver.kt b/...va/com/amazonaws/services/chime/sdk/meetings/internal/audio/DefaultAudioClientObserver.kt
@@ -558,7 +558,7 @@ class DefaultAudioClientObserver(
     }
 
     private fun notifyFailed(statusCode: MeetingSessionStatusCode?) {
-        val attributes = statusCode?.let {
+        val attributes: MutableMap<EventAttributeName, Any>? = statusCode?.let {
             mutableMapOf(
                 EventAttributeName.meetingStatus to statusCode,
                 EventAttributeName.meetingErrorMessage to statusCode.toString()

diff --git a/...a/com/amazonaws/services/chime/sdk/meetings/internal/ingestion/IngestionEventConverter.kt b/...a/com/amazonaws/services/chime/sdk/meetings/internal/ingestion/IngestionEventConverter.kt
@@ -115,7 +115,7 @@ object IngestionEventConverter {
     }
 
     private fun toIngestionPayload(event: MeetingEventItem, metadataAttributeKeys: Set<String>): IngestionPayload {
-        val payload = mutableMapOf(
+        val payload: MutableMap<String, Any> = mutableMapOf(
             NAME_KEY to event.data.name,
             TIMESTAMP_KEY to (event.data.eventAttributes[EventAttributeName.timestampMs.name] as Double).toLong(),
             ID_KEY to event.id
@@ -130,7 +130,7 @@ object IngestionEventConverter {
     }
 
     private fun toIngestionPayload(dirtyEvent: DirtyMeetingEventItem, metadataAttributeKeys: Set<String>): IngestionPayload {
-        val payload = mutableMapOf(
+        val payload: MutableMap<String, Any> = mutableMapOf(
             NAME_KEY to dirtyEvent.data.name,
             TTL_KEY to dirtyEvent.ttl,
             TIMESTAMP_KEY to (dirtyEvent.data.eventAttributes[EventAttributeName.timestampMs.name] as Double).toLong(),

diff --git a/app/src/main/java/com/amazonaws/services/chime/sdkdemo/utils/CpuVideoProcessor.kt b/app/src/main/java/com/amazonaws/services/chime/sdkdemo/utils/CpuVideoProcessor.kt
@@ -164,7 +164,7 @@ class CpuVideoProcessor(private val logger: Logger, eglCoreFactory: EglCoreFacto
                 val gValue = rgbaBuffer.data[gLocation].toPositiveInt()
                 val bValue = rgbaBuffer.data[bLocation].toPositiveInt()
 
-                val newValue = ((rValue + gValue + bValue) / (3.0)).toByte()
+                val newValue = ((rValue + gValue + bValue) / (3.0)).toInt().toByte()
 
                 rgbaBuffer.data.put(rLocation, newValue)
                 rgbaBuffer.data.put(gLocation, newValue)