Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 12:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Audio stats now reset when AudioMixer is killed

Browse source
This commit is contained in:
wangyix 2014-07-22 10:27:26 -07:00
parent f6ef61e76a
commit 847bc28990
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3338,7 +3338,7 @@ void Application::nodeKilled(SharedNodePointer node) {
_modelEditSender.nodeKilled(node); _modelEditSender.nodeKilled(node);
if (node->getType() == NodeType::AudioMixer) { if (node->getType() == NodeType::AudioMixer) {
QMetaObject::invokeMethod(&_audio, "resetIncomingMixedAudioSequenceNumberStats"); QMetaObject::invokeMethod(&_audio, "audioMixerKilled");
} }
if (node->getType() == NodeType::VoxelServer) { if (node->getType() == NodeType::VoxelServer) {

19
interface/src/Audio.cpp
View file

@ -152,11 +152,28 @@ void Audio::reset() {
_starveCount = 0; _starveCount = 0;
_consecutiveNotMixedCount = 0; _consecutiveNotMixedCount = 0;
_outgoingAvatarAudioSequenceNumber = 0;
resetStats();
}
void Audio::resetStats() {
_audioMixerAvatarStreamAudioStats = AudioStreamStats(); _audioMixerAvatarStreamAudioStats = AudioStreamStats();
_audioMixerInjectedStreamAudioStatsMap.clear(); _audioMixerInjectedStreamAudioStatsMap.clear();
_outgoingAvatarAudioSequenceNumber = 0;
_incomingMixedAudioSequenceNumberStats.reset(); _incomingMixedAudioSequenceNumberStats.reset();
_interframeTimeGapStats.reset();
_inputRingBufferFramesAvailableStats.reset();
_outputRingBufferFramesAvailableStats.reset();
_audioOutputBufferFramesAvailableStats.reset();
}
void Audio::audioMixerKilled() {
_outgoingAvatarAudioSequenceNumber = 0;
resetStats();
} }
QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) { QAudioDeviceInfo getNamedAudioDeviceForMode(QAudio::Mode mode, const QString& deviceName) {

3
interface/src/Audio.h
View file

@ -93,7 +93,8 @@ public slots:
void addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples); void addSpatialAudioToBuffer(unsigned int sampleTime, const QByteArray& spatialAudio, unsigned int numSamples);
void handleAudioInput(); void handleAudioInput();
void reset(); void reset();
void resetIncomingMixedAudioSequenceNumberStats() { _incomingMixedAudioSequenceNumberStats.reset(); } void resetStats();
void audioMixerKilled();
void toggleMute(); void toggleMute();
void toggleAudioNoiseReduction(); void toggleAudioNoiseReduction();
void toggleToneInjection(); void toggleToneInjection();