lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

vad: show a drop shadow around talking participants

Browse source 
use "voiceActivity" from the conferences informations to show
talking participants

https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/741

Change-Id: Iaedc61ce485ff03464128b5a17e0a6a0ea9d2c2e
This commit is contained in:
Sébastien Blin 2022-08-01 11:06:32 -04:00
parent 17e97ded71
commit d7d29156db
9 changed files with 49 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/callparticipantsmodel.cpp
View file

@ -98,6 +98,9 @@ CallParticipantsModel::data(const QModelIndex& index, int role) const
case Role::HandRaised:
return QVariant::fromValue(
participant.item.value(lrc::api::ParticipantsInfosStrings::HANDRAISED));
case Role::VoiceActivity:
return QVariant::fromValue(
participant.item.value(lrc::api::ParticipantsInfosStrings::VOICEACTIVITY));
}
return QVariant();
}

1
src/app/callparticipantsmodel.h
View file

@ -45,6 +45,7 @@
X(IsModerator) \
X(IsLocal) \
X(IsContact) \
X(VoiceActivity) \
X(HandRaised)
namespace CallParticipant {

2
src/app/mainview/components/OngoingCallPage.qml
View file

@ -175,7 +175,7 @@ Rectangle {
id: participantsLayer
anchors.fill: parent
anchors.centerIn: parent
anchors.margins: 3
anchors.margins: 1
visible: participantsLayer.count !== 0
participantsSide: callOverlay.participantsSide

30
src/app/mainview/components/ParticipantOverlay.qml
View file

@ -56,6 +56,7 @@ Item {
property bool participantIsModeratorMuted: false
property bool participantHandIsRaised: false
property bool videoMuted: true
property bool voiceActive: false
property bool isLocalMuted: true
property bool meHost: CallAdapter.isCurrentHost()
@ -90,9 +91,21 @@ Item {
}
}
Rectangle {
z: -1
color: JamiTheme.buttonTintedBlue
radius: 10
visible:voiceActive
width: participantIsActive ? mediaDistRender.contentRect.width + 2 : undefined
height: participantIsActive ? mediaDistRender.contentRect.height + 2 : undefined
anchors.centerIn: participantIsActive ? parent : undefined
anchors.fill: participantIsActive ? undefined : parent
}
VideoView {
id: mediaDistRender
anchors.fill: parent
anchors.margins: 2
rendererId: root.sinkId
crop: !participantIsActive
@ -118,17 +131,13 @@ Item {
}
}
overlayItems: Rectangle {
overlayItems: Item {
id: overlayRect
width: participantIsActive ? mediaDistRender.contentRect.width : undefined
height: participantIsActive ? mediaDistRender.contentRect.height : undefined
width: participantIsActive ? mediaDistRender.contentRect.width - 2 : undefined
height: participantIsActive ? mediaDistRender.contentRect.height - 2 : undefined
anchors.centerIn: participantIsActive ? parent : undefined
anchors.fill: participantIsActive ? undefined : parent
color: "transparent"
Item {
anchors.fill: parent
HoverHandler {
onPointChanged: {
@ -145,12 +154,10 @@ Item {
participantRect.opacity = hovered ? 1 : 0
}
}
}
Rectangle {
Item {
id: participantRect
anchors.fill: parent
color: "transparent"
opacity: 0
// Participant buttons for moderation
@ -182,11 +189,10 @@ Item {
// - In another participant, if i am not moderator, the mute state is isLocalMuted || participantIsModeratorMuted
// - In another participant, if i am moderator, the mute state is isLocalMuted
// - In my video, the mute state is isLocalMuted
Rectangle {
Item {
id: participantIndicators
width: participantRect.width
height: shapeHeight
color: "transparent"
anchors.bottom: parent.bottom
Shape {

7
src/app/mainview/components/ParticipantsLayer.qml
View file

@ -19,8 +19,8 @@
import QtQuick
import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15
import QtQuick.Layouts
import QtQuick.Controls
import net.jami.Adapters 1.1
import net.jami.Models 1.1
@ -55,6 +55,8 @@ Item {
id: callVideoMedia
ParticipantOverlay {
id: overlay
anchors.fill: parent
anchors.leftMargin: leftMargin_
@ -71,6 +73,7 @@ Item {
videoMuted: videoMuted_
participantIsActive: active_
isLocalMuted: audioLocalMuted_
voiceActive: voiceActive_
participantIsModeratorMuted: audioModeratorMuted_
participantHandIsRaised: isHandRaised_

2
src/app/mainview/components/ParticipantsLayoutHorizontal.qml
View file

@ -120,6 +120,7 @@ SplitView {
property bool audioLocalMuted_: AudioLocalMuted
property bool audioModeratorMuted_: AudioModeratorMuted
property bool isHandRaised_: HandRaised
property bool voiceActive_: VoiceActivity
}
}
}
@ -307,6 +308,7 @@ SplitView {
property bool audioLocalMuted_: AudioLocalMuted
property bool audioModeratorMuted_: AudioModeratorMuted
property bool isHandRaised_: HandRaised
property bool voiceActive_: VoiceActivity
}
}
}

2
src/app/mainview/components/ParticipantsLayoutVertical.qml
View file

@ -215,6 +215,7 @@ SplitView {
property bool audioLocalMuted_: AudioLocalMuted
property bool audioModeratorMuted_: AudioModeratorMuted
property bool isHandRaised_: HandRaised
property bool voiceActive_: VoiceActivity
}
}
}
@ -288,6 +289,7 @@ SplitView {
property bool audioLocalMuted_: AudioLocalMuted
property bool audioModeratorMuted_: AudioModeratorMuted
property bool isHandRaised_: HandRaised
property bool voiceActive_: VoiceActivity
}
}
}

5
src/libclient/api/callparticipantsmodel.h
View file

@ -52,6 +52,7 @@ const QString AUDIOLOCALMUTED = "audioLocalMuted";
const QString AUDIOMODERATORMUTED = "audioModeratorMuted";
const QString ISMODERATOR = "isModerator";
const QString HANDRAISED = "handRaised";
const QString VOICEACTIVITY = "voiceActivity";
const QString STREAMID = "sinkId"; // TODO update
const QString BESTNAME = "bestName";
const QString ISLOCAL = "isLocal";
@ -81,6 +82,7 @@ struct ParticipantInfos
audioModeratorMuted = infos[ParticipantsInfosStrings::AUDIOMODERATORMUTED] == "true";
isModerator = infos[ParticipantsInfosStrings::ISMODERATOR] == "true";
handRaised = infos[ParticipantsInfosStrings::HANDRAISED] == "true";
voiceActivity = infos[ParticipantsInfosStrings::VOICEACTIVITY] == "true";
if (infos[ParticipantsInfosStrings::STREAMID].isEmpty())
sinkId = callId + uri + device;
@ -107,6 +109,7 @@ struct ParticipantInfos
bool islocal {false};
bool isContact {false};
bool handRaised {false};
bool voiceActivity {false};
bool operator==(const ParticipantInfos& other) const
{
@ -115,7 +118,7 @@ struct ParticipantInfos
&& audioModeratorMuted == other.audioModeratorMuted && avatar == other.avatar
&& bestName == other.bestName && isContact == other.isContact
&& islocal == other.islocal && videoMuted == other.videoMuted
&& handRaised == other.handRaised;
&& handRaised == other.handRaised && voiceActivity == other.voiceActivity;
}
};

5
src/libclient/callparticipantsmodel.cpp
View file

@ -115,7 +115,9 @@ CallParticipants::addParticipant(const ParticipantInfos& participant)
std::lock_guard<std::mutex> lk(participantsMtx_);
auto it = participants_.find(participant.sinkId);
if (it == participants_.end()) {
participants_.insert(std::next(participants_.begin(), idx_), participant.sinkId, participant);
participants_.insert(std::next(participants_.begin(), idx_),
participant.sinkId,
participant);
added = true;
} else {
if (participant == (*it))
@ -198,6 +200,7 @@ CallParticipants::toQJsonObject(uint index) const
ret[ParticipantsInfosStrings::ISLOCAL] = participant->islocal;
ret[ParticipantsInfosStrings::ISCONTACT] = participant->isContact;
ret[ParticipantsInfosStrings::HANDRAISED] = participant->handRaised;
ret[ParticipantsInfosStrings::VOICEACTIVITY] = participant->voiceActivity;
ret[ParticipantsInfosStrings::CALLID] = callId_;
return ret;