filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix / prevent camera switch if no second camera

Browse Source
This commit is contained in:
Valere 2020-06-20 09:50:32 +02:00
parent 64a67b57b8
commit 6b806922ee
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt
View File

@ -179,7 +179,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
var remoteSurfaceRenderer: MutableList<WeakReference<SurfaceViewRenderer>> = ArrayList() var remoteSurfaceRenderer: MutableList<WeakReference<SurfaceViewRenderer>> = ArrayList()
fun addIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) { fun addIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) {
if (renderer == null) return if (renderer == null) return
val exists = list.firstOrNull() { val exists = list.firstOrNull() {
it.get() == renderer it.get() == renderer
} != null } != null
@ -189,7 +189,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
} }
fun removeIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) { fun removeIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) {
if (renderer == null) return if (renderer == null) return
val exists = list.indexOfFirst { val exists = list.indexOfFirst {
it.get() == renderer it.get() == renderer
} }
@ -736,6 +736,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
fun switchCamera() { fun switchCamera() {
Timber.v("## VOIP switchCamera") Timber.v("## VOIP switchCamera")
if (!canSwitchCamera()) return
if (currentCall != null && currentCall?.mxCall?.state is CallState.Connected && currentCall?.mxCall?.isVideoCall == true) { if (currentCall != null && currentCall?.mxCall?.state is CallState.Connected && currentCall?.mxCall?.isVideoCall == true) {
videoCapturer?.switchCamera(object : CameraVideoCapturer.CameraSwitchHandler { videoCapturer?.switchCamera(object : CameraVideoCapturer.CameraSwitchHandler {
// Invoked on success. |isFrontCamera| is true if the new camera is front facing. // Invoked on success. |isFrontCamera| is true if the new camera is front facing.