Merge pull request #45 from fastogt/master

camera_with_rtmp: android build failure due to type mismatch #36
pinkfish · Feb 27, 2021 · fcd9e01 · fcd9e01
2 parents d38bd94 + b89c4df
commit fcd9e01
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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
@@ -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
@@ -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
@@ -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 {
@@ -424,10 +424,10 @@ class VideoEncoder(
         } else {
             mediaCodec.getOutputBuffers().get(outBufferIndex)
         }
-        processOutput(byteBuffer, mediaCodec, outBufferIndex, bufferInfo)
+        processOutput(byteBuffer!!, mediaCodec, outBufferIndex, bufferInfo)
     }
 
     companion object {
         private val TAG: String? = "VideoEncoder"
     }
-}
+}