From a76695cb9705890fe0a58b65f07d4cef9bb57542 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 9 Jun 2022 14:17:13 +0200
Subject: [PATCH] Videoconference : Fix blinking on active speaker.

---
 linphone-app/src/components/conference/ConferenceListener.cpp | 2 +-
 .../src/components/participant/ParticipantDeviceListener.cpp  | 1 -
 linphone-app/ui/modules/Linphone/Camera/CameraItem.qml        | 2 +-
 linphone-app/ui/modules/Linphone/Camera/CameraView.qml        | 4 ++--
 .../ui/views/App/Calls/VideoConferenceActiveSpeaker.qml       | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/linphone-app/src/components/conference/ConferenceListener.cpp b/linphone-app/src/components/conference/ConferenceListener.cpp
index 2228b6262..82738d5f8 100644
--- a/linphone-app/src/components/conference/ConferenceListener.cpp
+++ b/linphone-app/src/components/conference/ConferenceListener.cpp
@@ -82,7 +82,7 @@ void ConferenceListener::onParticipantDeviceMediaAvailabilityChanged(const std::
 	emit participantDeviceMediaAvailabilityChanged(participantDevice);
 }
 void ConferenceListener::onParticipantDeviceIsSpeakingChanged(const std::shared_ptr<linphone::Conference> & conference, const std::shared_ptr<const linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
-	qDebug() << "onParticipantDeviceIsSpeakingChanged: "  << participantDevice->getAddress()->asString().c_str() << ". Speaking:" << isSpeaking;
+	//qDebug() << "onParticipantDeviceIsSpeakingChanged: "  << participantDevice->getAddress()->asString().c_str() << ". Speaking:" << isSpeaking;
 	emit participantDeviceIsSpeakingChanged(participantDevice, isSpeaking);
 }
 void ConferenceListener::onStateChanged(const std::shared_ptr<linphone::Conference> & conference, linphone::Conference::State newState){
diff --git a/linphone-app/src/components/participant/ParticipantDeviceListener.cpp b/linphone-app/src/components/participant/ParticipantDeviceListener.cpp
index 77e0e6ce6..de188396a 100644
--- a/linphone-app/src/components/participant/ParticipantDeviceListener.cpp
+++ b/linphone-app/src/components/participant/ParticipantDeviceListener.cpp
@@ -29,7 +29,6 @@ ParticipantDeviceListener::ParticipantDeviceListener(QObject *parent) : QObject(
 
 //--------------------------------------------------------------------
 void ParticipantDeviceListener::onIsSpeakingChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
-	qDebug() << "onIsSpeakingChanged " << isSpeaking;
 	emit isSpeakingChanged(participantDevice, isSpeaking);
 }
 
diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml b/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
index c26ad028e..ee63106d9 100644
--- a/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
+++ b/linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
@@ -33,7 +33,7 @@ Item {
 	property bool d : callModel && callModel.cameraEnabled
 	property bool isReady: cameraLoader.item && cameraLoader.item.isReady
 	
-	onCurrentDeviceChanged: resetActive()
+	onCurrentDeviceChanged: {if(container.isCameraFromDevice) resetActive()}
 	function resetActive(){
 		resetTimer.resetActive()
 	}
diff --git a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
index 4dccf0f6f..5c0e4fb3d 100644
--- a/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
+++ b/linphone-app/ui/modules/Linphone/Camera/CameraView.qml
@@ -21,7 +21,7 @@ Item{
 	property alias isFullscreen: camera.isFullscreen
 	property alias isCameraFromDevice: camera.isCameraFromDevice
 	property bool showCloseButton: true
-	property bool showActiveSpeaker: true
+	property bool showActiveSpeakerOverlay: true
 	property color color : CameraViewStyle.outBackgroundColor
 	signal closeRequested()
 	
@@ -36,7 +36,7 @@ Item{
         spread: 0.9
         color: CameraViewStyle.border.color
         cornerRadius: backgroundArea.radius + glowRadius
-        visible: mainItem.showActiveSpeaker && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
+        visible: mainItem.showActiveSpeakerOverlay && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
     }
 	Rectangle {
         id: backgroundArea
diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
index f4dd449ef..03ee11abc 100644
--- a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
+++ b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
@@ -46,7 +46,7 @@ Item {
 		anchors.rightMargin: isRightReducedLayout ? 10 : 140
 		isPaused: (callModel && callModel.pausedByUser) || (currentDevice && currentDevice.isPaused) //callModel.pausedByUser
 		showCloseButton: false
-		showActiveSpeaker: false	// This is an active speaker. We don't need to show the indicator.
+		showActiveSpeakerOverlay: false	// This is an active speaker. We don't need to show the indicator.
 		color: 'black'
 	}
 	ScrollableListView{