Backport "Merge PR #5926: FEAT(client): Always stop audio on/off cue when switching state" to 1.5.x #6018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AudioOutput keeps track of users and their speech, as well as samples in qmOutputs. The mix() method will iterate over them and append all completed outputs to a list 'qlDel'. This list is then - outside of any synchronization - used to remove entries from qmOutputs. Previously, other methods were also deleting from qmOutputs directly from other threads. In rare conditions, when the output just finished and is added to qlDel and then additionally manually deleted, the pointer could be subject to a double delete. This commit tries to mitigate the problem and overhauls the output deletion by introducing a singal and a slot, delegating the deletion to the audio thread event queue. A new AudioOutputToken class is introduced, to prevent direct access to audio buffer pointers. (cherry picked from commit 7406495)
Previously, audio cues would play and continue to play no matter what. If very long sound samples were used, they would play longer than the user sends audio (regardless of PTT or VA) and they could even play over each other. The commit introduces a member in AudioInput to save the last sample played for audio cues. When switching from talking to non-talking or vice versa, it first stops the previously played cue. Fixes mumble-voip#1671 (cherry picked from commit 89d5890)
The name AudioOutputUser is a legacy one, or, in case it is meant as "user of the audio output API", at least slightly misleading. Since both AudioOutputSpeech and AudioOutputSample inherit AudioOutputUser it makes more sense to name it as what it actually is: A buffer wrapper. (cherry picked from commit d79850c)
Krzmbrzl
force-pushed
the
backport/1.5.x/pr-5926
branch
from
9a9dc97 to
7f755b6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This will backport the following commits from
masterto1.5.x:Questions ?
Please refer to the Backport tool documentation