Skip to content

[stable18] Warn user on high load #3899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 19 commits into from
Jul 21, 2020
Merged

[stable18] Warn user on high load #3899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1a09ea7
Add analyzer for the quality of peer connections
danxuliu Jun 22, 2020
5c45e23
Take round trip time into account when calculating the quality
danxuliu Jul 7, 2020
949f10a
Trigger events when the quality changes
danxuliu Jun 22, 2020
e2aa17d
Make possible to enable and disable the analysis of audio or video
danxuliu Jul 3, 2020
97e12ca
Guard against null screen peer
danxuliu Jul 2, 2020
a205ca4
Move peer and screenPeer to attributes in CallParticipantModel
danxuliu Jul 3, 2020
790c981
Add peer and screenPeer attributes to LocalCallParticipantModel
danxuliu Jul 3, 2020
ca4fdd1
Add analyzer for participants
danxuliu Jul 3, 2020
b5e724e
Add analyzer for calls
danxuliu Jul 3, 2020
58fc1f5
Show warning when the quality of the connection is bad
danxuliu Jul 3, 2020
d4ec4d9
Add a grace period before hiding the quality warning
danxuliu Jul 3, 2020
581d68a
Show tooltip only if the quality warning has not been recently shown
danxuliu Jul 3, 2020
6cb8de5
Take video and screen quality into account in the quality warning
danxuliu Jul 6, 2020
ffe3cf6
Move setting class attributes to its own method
danxuliu Jul 9, 2020
a6b897a
Increase grace period for quality tooltip
danxuliu Jul 9, 2020
087330b
Fix duplicated event listeners in ParticipantAnalyzer
danxuliu Jul 16, 2020
ad27de1
Dedicated connection warning icon
nickvergessen Jul 15, 2020
e12ca19
Add buttons to disable video and screen share to quality warning tooltip
Jul 17, 2020
1bff844
Add button to explicitly dismiss the quality warning tooltip
Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add buttons to disable video and screen share to quality warning tooltip 
Signed-off-by: Marco Ambrosini <[email protected]>
  • Loading branch information
@danxuliu
Marco Ambrosini authored and danxuliu committed Jul 21, 2020
commit e12ca1943a1b835307892b8c61f21698dcce7db3
33 changes: 31 additions & 2 deletions src/components/CallView/LocalMediaControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,17 @@
fill-color="#e9322d"
title=""
:size="24" />
<template>
<div class="hint">
<span>{{ qualityWarningTooltip.content }}</span>
</template>
<div class="hint__actions">
<button
v-if="qualityWarningTooltip.action"
class="primary"
@click="executeQualityWarningTooltipAction">
{{ qualityWarningTooltip.actionLabel }}
</button>
</div>
</div>
</Popover>
</div>
</div>
Expand Down Expand Up @@ -415,6 +423,16 @@ export default {
}
})
},
executeQualityWarningTooltipAction() {
if (this.qualityWarningTooltip.action === '') {
return
}
if (this.qualityWarningTooltip.action === 'disableScreenShare') {
this.model.stopSharingScreen()
} else if (this.qualityWarningTooltip.action === 'disableVideo') {
this.model.disableVideo()
}
},
},
}
</script>
Expand Down Expand Up @@ -520,4 +538,15 @@ export default {
height: 32px;
filter: drop-shadow(1px 1px 4px var(--color-box-shadow));
}

.hint {
padding: 4px;
text-align: left;
&__actions{
display: flex;
flex-direction: row-reverse;
justify-content: space-between;
padding-top:4px;
}
}
</style>
37 changes: 25 additions & 12 deletions src/components/CallView/LocalVideo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,27 +192,40 @@ export default {
return null
}

let message = ''
const tooltip = {}
if (!this.localMediaModel.attributes.audioEnabled && this.localMediaModel.attributes.videoEnabled && this.localMediaModel.attributes.localScreen) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see you. To improve the situation try to disable your video while doing a screenshare.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see you. To improve the situation try to disable your video while doing a screenshare.')
tooltip.actionLabel = t('spreed', 'Disable video')
tooltip.action = 'disableVideo'
} else if (!this.localMediaModel.attributes.audioEnabled && this.localMediaModel.attributes.localScreen) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see your screen.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see your screen.')
tooltip.actionLabel = ''
tooltip.action = ''
} else if (!this.localMediaModel.attributes.audioEnabled && this.localMediaModel.attributes.videoEnabled) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see you.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to see you.')
tooltip.actionLabel = ''
tooltip.action = ''
} else if (this.localMediaModel.attributes.videoEnabled && this.localMediaModel.attributes.localScreen) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see you. To improve the situation try to disable your video while doing a screenshare.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see you. To improve the situation try to disable your video while doing a screenshare.')
tooltip.actionLabel = t('spreed', 'Disable video')
tooltip.action = 'disableVideo'
} else if (this.localMediaModel.attributes.localScreen) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see your screen. To improve the situation try to disable your screenshare.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see your screen. To improve the situation try to disable your screenshare.')
tooltip.actionLabel = t('spreed', 'Disable screenshare')
tooltip.action = 'disableScreenShare'
} else if (this.localMediaModel.attributes.videoEnabled) {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see you. To improve the situation try to disable your video.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand and see you. To improve the situation try to disable your video.')
tooltip.actionLabel = t('spreed', 'Disable video')
tooltip.action = 'disableVideo'
} else {
message = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand you.')
tooltip.content = t('spreed', 'Your internet connection or computer are busy and other participants might be unable to understand you.')
tooltip.actionLabel = ''
tooltip.action = ''
}

return {
content: message,
show: this.showQualityWarningTooltip,
}
tooltip.show = this.showQualityWarningTooltip

return tooltip
},
},

Expand Down