From 6c82e4e3d158ed8917d7bd6200fd4ca7b26888f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 6 Oct 2021 16:36:47 -0400
Subject: [PATCH] call: cleanup
Change-Id: Icdf1397ad0a3fd4cbfc2e35921ae44ff96c3d027
---
.../app/src/main/java/cx/ring/fragments/CallFragment.kt | 6 ++----
.../src/main/java/cx/ring/services/HardwareServiceImpl.kt | 8 ++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
index 37ba379e3..62923380b 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
@@ -94,6 +94,7 @@ import net.jami.services.HardwareService.AudioState
import net.jami.services.NotificationService
import java.util.*
import javax.inject.Inject
+import kotlin.math.max
import kotlin.math.min
@AndroidEntryPoint
@@ -1041,10 +1042,7 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
val bufferRect = RectF(0f, 0f, mPreviewHeight.toFloat(), mPreviewWidth.toFloat())
bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
- val scale = Math.max(
- viewHeight.toFloat() / mPreviewHeight,
- viewWidth.toFloat() / mPreviewWidth
- )
+ val scale = max(viewHeight.toFloat() / mPreviewHeight, viewWidth.toFloat() / mPreviewWidth)
matrix.postScale(scale, scale, centerX, centerY)
matrix.postRotate((90 * (rotation - 2)).toFloat(), centerX, centerY)
} else if (Surface.ROTATION_180 == rotation) {
diff --git a/ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt b/ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt
index dcf9d8c1b..25d7fc7af 100644
--- a/ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt
+++ b/ring-android/app/src/main/java/cx/ring/services/HardwareServiceImpl.kt
@@ -327,7 +327,7 @@ class HardwareServiceImpl(
videoSurfaces[id]?.get()?.let { holder ->
shm.window = startVideo(id, holder.surface, width, height)
if (shm.window == 0L) {
- Log.w(TAG, "DJamiService.decodingStarted() no window !")
+ Log.w(TAG, "decodingStarted() no window !")
} else {
videoEvents.onNext(VideoEvent(shm.id, started = true, w = shm.w, h = shm.h))
}
@@ -431,7 +431,7 @@ class HardwareServiceImpl(
if (mIsCapturing && mCapturingId != null && mCapturingId == camId) {
return
}
- val cam = camId ?: if (mCapturingId != null) mCapturingId else cameraService.switchInput(true)
+ val cam = camId ?: mCapturingId ?: cameraService.switchInput(true)
val videoParams = cameraService.getParams(cam)
if (videoParams == null) {
Log.w(TAG, "startCapture: no video parameters ")
@@ -456,10 +456,10 @@ class HardwareServiceImpl(
videoParams.codec = null
}
}
- Log.w(TAG, "startCapture: call " + cam + " " + videoParams.codec + " useHardwareCodec:" + useHardwareCodec + " bitrate:" + mPreferenceService.bitrate)
+ Log.w(TAG, "startCapture: cam " + cam + " " + videoParams.codec + " useHardwareCodec:" + useHardwareCodec + " bitrate:" + mPreferenceService.bitrate)
mIsCapturing = true
mCapturingId = videoParams.id
- Log.d(TAG, "startCapture: startCapture " + videoParams.id + " " + videoParams.width + "x" + videoParams.height + " rot" + videoParams.rotation)
+ Log.d(TAG, "startCapture: openCamera " + videoParams.id + " " + videoParams.width + "x" + videoParams.height + " rot" + videoParams.rotation)
mUiScheduler.scheduleDirect {
cameraService.openCamera(videoParams, surface,
object : CameraListener {
--
GitLab