From 14c6a62669e4b65821d1b15e26d29c2d42551704 Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Mon, 21 Dec 2020 17:26:05 +0300
Subject: [PATCH 1/3] camera_with_rtmp: android build failure due to type
 mismatch #36

---
 .../src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt    | 2 +-
 .../main/kotlin/com/whelksoft/camera_with_rtmp/CameraUtils.kt   | 2 +-
 .../main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt
index 39fcd9b..2a8fe49 100644
--- a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt
+++ b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/Camera.kt
@@ -679,7 +679,7 @@ class Camera(
         orientationEventListener.enable()
         val characteristics = cameraManager.getCameraCharacteristics(cameraName)
         isFrontFacing = characteristics.get(CameraCharacteristics.LENS_FACING) == CameraMetadata.LENS_FACING_FRONT
-        sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION)
+        sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION)!!
         currentOrientation = Math.round(activity.resources.configuration.orientation / 90.0).toInt() * 90
         val preset = ResolutionPreset.valueOf(resolutionPreset!!)
         recordingProfile = CameraUtils.getBestAvailableCamcorderProfileForResolutionPreset(cameraName, preset)
diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/CameraUtils.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/CameraUtils.kt
index ea1166d..6db15a2 100644
--- a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/CameraUtils.kt
+++ b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/CameraUtils.kt
@@ -48,7 +48,7 @@ object CameraUtils {
             val characteristics = cameraManager.getCameraCharacteristics(cameraName)
             details["name"] = cameraName
             val sensorOrientation = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION)
-            details["sensorOrientation"] = sensorOrientation
+            details["sensorOrientation"] = sensorOrientation!!
             val lensFacing = characteristics.get(CameraCharacteristics.LENS_FACING)
             when (lensFacing) {
                 CameraMetadata.LENS_FACING_FRONT -> details["lensFacing"] = "front"
diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
index b9b25e0..e268360 100644
--- a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
+++ b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
@@ -424,7 +424,7 @@ class VideoEncoder(
         } else {
             mediaCodec.getOutputBuffers().get(outBufferIndex)
         }
-        processOutput(byteBuffer, mediaCodec, outBufferIndex, bufferInfo)
+        processOutput(byteBuffer!!, mediaCodec, outBufferIndex, bufferInfo)
     }
 
     companion object {

From ac4c8aa93768b8684c1d374a37850c4b699c68af Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Mon, 21 Dec 2020 17:34:12 +0300
Subject: [PATCH 2/3] Hot fix

---
 .../kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
index e268360..cdb4cb8 100644
--- a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
+++ b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
@@ -215,7 +215,7 @@ class VideoEncoder(
     private fun sendSPSandPPS(mediaFormat: MediaFormat) {
         //H265
         if (type!!.equals(CodecUtil.H265_MIME)) {
-            val byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"))
+            val byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"))!!
             getVideoData.onSpsPpsVps(byteBufferList!![1], byteBufferList[2], byteBufferList[0])
             //H264
         } else {
@@ -430,4 +430,4 @@ class VideoEncoder(
     companion object {
         private val TAG: String? = "VideoEncoder"
     }
-}
\ No newline at end of file
+}

From b89c4df2a342d8faa8e421274af4663e128f5449 Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Mon, 21 Dec 2020 17:38:22 +0300
Subject: [PATCH 3/3] Next try

---
 .../main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
index cdb4cb8..80e119a 100644
--- a/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
+++ b/android/src/main/kotlin/com/whelksoft/camera_with_rtmp/VideoEncoder.kt
@@ -215,7 +215,7 @@ class VideoEncoder(
     private fun sendSPSandPPS(mediaFormat: MediaFormat) {
         //H265
         if (type!!.equals(CodecUtil.H265_MIME)) {
-            val byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0"))!!
+            val byteBufferList = extractVpsSpsPpsFromH265(mediaFormat.getByteBuffer("csd-0")!!)
             getVideoData.onSpsPpsVps(byteBufferList!![1], byteBufferList[2], byteBufferList[0])
             //H264
         } else {