From 1b0b92fbc3fe93447ef118dd6ed7a0812e2b64f0 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 12 Jul 2022 15:08:42 +0200
Subject: [PATCH] Video conference : On pause, deactivate camera to display
 avatar instead of putting them on pause view. Fix camera deactivation mode.

---
 linphone-app/ui/modules/Linphone/Camera/CameraItem.qml       | 4 ++--
 linphone-app/ui/modules/Linphone/Sticker/Sticker.qml         | 2 +-
 .../ui/views/App/Calls/VideoConferenceActiveSpeaker.qml      | 5 ++---
 linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml      | 4 ++--
 linphone-app/ui/views/App/Calls/WaitingRoom.qml              | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml b/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
index ca92a8b76..5a901d9ff 100644
--- a/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
+++ b/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
@@ -22,8 +22,8 @@ Item {
 	property bool isFullscreen: false
 	property bool hideCamera: false
 	property bool isPaused: false
-	property bool deactivateCamera: true
-	property bool isVideoEnabled: deactivateCamera && (!callModel || callModel.videoEnabled)
+	property bool deactivateCamera: false
+	property bool isVideoEnabled: !deactivateCamera && (!callModel || callModel.videoEnabled)
 									&& (!container.currentDevice || callModel && (container.currentDevice
 																			&& (container.currentDevice.videoEnabled || (container.currentDevice.isMe && callModel.cameraEnabled))))
 
diff --git a/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml b/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
index b4440ceb0..42eb4b25b 100644
--- a/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
+++ b/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
@@ -19,7 +19,7 @@ import UtilsCpp 1.0
 Item{
 	id: mainItem
 	
-	property bool flipped : deactivateCamera && camera.isReady
+	property bool flipped : !deactivateCamera && camera.isReady
 	
 	
 	property bool showCustomButton: false
diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
index a50f8394a..e19dd8f29 100644
--- a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
+++ b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
@@ -54,7 +54,7 @@ Item {
 	Sticker{
 		id: cameraView
 		callModel: mainItem.callModel
-		deactivateCamera: mainItem.cameraEnabled && (!currentDevice || currentDevice.videoEnabled)
+		deactivateCamera: (callModel && callModel.pausedByUser) || !mainItem.cameraEnabled || (currentDevice && !currentDevice.videoEnabled)
 		isCameraFromDevice: false
 		isPreview: false
 		anchors.fill: parent
@@ -96,8 +96,7 @@ Item {
 					anchors.fill: parent
 					anchors.margins: 3
 					
-					deactivateCamera: index >=0 && ( (!modelData && mainItem.cameraEnabled) || modelData.videoEnabled)
-					//onCameraEnabledChanged: console.log(username +" => " +modelData.videoEnabled)
+					deactivateCamera: index <0 || (!modelData && !mainItem.cameraEnabled) || !modelData.videoEnabled || (callModel && callModel.pausedByUser)
 					currentDevice: modelData
 					callModel: mainItem.callModel
 					isCameraFromDevice:  mainItem.callModel.isConference
diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml b/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml
index c2c0ec172..94f60f9b1 100644
--- a/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml
+++ b/linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml
@@ -58,11 +58,11 @@ Mosaic {
 				id: cameraView
 				anchors.fill: parent
 				
-				deactivateCamera: index >=0 && grid.cameraEnabled
+				deactivateCamera: index <0 || !grid.cameraEnabled || grid.callModel.pausedByUser
 				currentDevice: gridModel.participantDevices.getAt(index)
 				callModel: participantDevices.callModel
 				isCameraFromDevice: true
-				isPaused: grid.callModel.pausedByUser || avatarCell.currentDevice && avatarCell.currentDevice.isPaused
+				isPaused: avatarCell.currentDevice && avatarCell.currentDevice.isPaused
 				showCloseButton: false
 				showCustomButton:  false
 				avatarStickerBackgroundColor: VideoConferenceStyle.container.avatar.stickerBackgroundColor
diff --git a/linphone-app/ui/views/App/Calls/WaitingRoom.qml b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
index c402d6057..b85dc6f0d 100644
--- a/linphone-app/ui/views/App/Calls/WaitingRoom.qml
+++ b/linphone-app/ui/views/App/Calls/WaitingRoom.qml
@@ -133,7 +133,7 @@ Rectangle {
 					height: cameraHeight
 					width : cameraWidth
 					
-					deactivateCamera: mainItem.previewLoaderEnabled
+					deactivateCamera: !mainItem.previewLoaderEnabled
 					callModel: mainItem.callModel
 					conferenceInfoModel: mainItem.conferenceInfoModel
 					/*