mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 21:26:25 +02:00
add test for audio jitter
This commit is contained in:
parent
7b8f616099
commit
e785c0cdf8
3 changed files with 77 additions and 0 deletions
|
@ -277,6 +277,17 @@ void setupPreferences() {
|
||||||
preference->setStep(1);
|
preference->setStep(1);
|
||||||
preferences->addPreference(preference);
|
preferences->addPreference(preference);
|
||||||
}
|
}
|
||||||
|
#if DEV_BUILD || PR_BUILD
|
||||||
|
{
|
||||||
|
auto getter = []()->float { return DependencyManager::get<AudioClient>()->getGateThreshold(); };
|
||||||
|
auto setter = [](float value) { return DependencyManager::get<AudioClient>()->setGateThreshold(value); };
|
||||||
|
auto preference = new SpinnerPreference(AUDIO, "Debug gate threshold", getter, setter);
|
||||||
|
preference->setMin(1);
|
||||||
|
preference->setMax((float)100);
|
||||||
|
preference->setStep(1);
|
||||||
|
preferences->addPreference(preference);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
{
|
{
|
||||||
auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); };
|
auto getter = []()->float { return qApp->getMaxOctreePacketsPerSecond(); };
|
||||||
|
|
|
@ -55,6 +55,8 @@ static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 100;
|
||||||
static const auto DEFAULT_POSITION_GETTER = []{ return Vectors::ZERO; };
|
static const auto DEFAULT_POSITION_GETTER = []{ return Vectors::ZERO; };
|
||||||
static const auto DEFAULT_ORIENTATION_GETTER = [] { return Quaternions::IDENTITY; };
|
static const auto DEFAULT_ORIENTATION_GETTER = [] { return Quaternions::IDENTITY; };
|
||||||
|
|
||||||
|
static const int DEFAULT_AUDIO_OUTPUT_GATE_THRESHOLD = 1;
|
||||||
|
|
||||||
Setting::Handle<bool> dynamicJitterBuffers("dynamicJitterBuffers", DEFAULT_DYNAMIC_JITTER_BUFFERS);
|
Setting::Handle<bool> dynamicJitterBuffers("dynamicJitterBuffers", DEFAULT_DYNAMIC_JITTER_BUFFERS);
|
||||||
Setting::Handle<int> maxFramesOverDesired("maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED);
|
Setting::Handle<int> maxFramesOverDesired("maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED);
|
||||||
Setting::Handle<int> staticDesiredJitterBufferFrames("staticDesiredJitterBufferFrames",
|
Setting::Handle<int> staticDesiredJitterBufferFrames("staticDesiredJitterBufferFrames",
|
||||||
|
@ -99,6 +101,8 @@ private:
|
||||||
|
|
||||||
AudioClient::AudioClient() :
|
AudioClient::AudioClient() :
|
||||||
AbstractAudioInterface(),
|
AbstractAudioInterface(),
|
||||||
|
_gateThreshold("audioOutputGateThreshold", DEFAULT_AUDIO_OUTPUT_GATE_THRESHOLD),
|
||||||
|
_gate(this, _gateThreshold.get()),
|
||||||
_audioInput(NULL),
|
_audioInput(NULL),
|
||||||
_desiredInputFormat(),
|
_desiredInputFormat(),
|
||||||
_inputFormat(),
|
_inputFormat(),
|
||||||
|
@ -540,11 +544,48 @@ void AudioClient::handleAudioDataPacket(QSharedPointer<ReceivedMessage> message)
|
||||||
emit receivedFirstPacket();
|
emit receivedFirstPacket();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if DEV_BUILD || PR_BUILD
|
||||||
|
_gate.insert(message);
|
||||||
|
#else
|
||||||
// Audio output must exist and be correctly set up if we're going to process received audio
|
// Audio output must exist and be correctly set up if we're going to process received audio
|
||||||
_receivedAudioStream.parseData(*message);
|
_receivedAudioStream.parseData(*message);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AudioClient::Gate::Gate(AudioClient* audioClient, int threshold) :
|
||||||
|
_audioClient(audioClient),
|
||||||
|
_threshold(threshold) {}
|
||||||
|
|
||||||
|
void AudioClient::Gate::setThreshold(int threshold) {
|
||||||
|
flush();
|
||||||
|
_threshold = std::max(threshold, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioClient::Gate::insert(QSharedPointer<ReceivedMessage> message) {
|
||||||
|
// Short-circuit for normal behavior
|
||||||
|
if (_threshold == 1) {
|
||||||
|
_audioClient->_receivedAudioStream.parseData(*message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_queue.push(message);
|
||||||
|
_index++;
|
||||||
|
|
||||||
|
if (_index % _threshold == 0) {
|
||||||
|
flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioClient::Gate::flush() {
|
||||||
|
while (!_queue.empty()) {
|
||||||
|
_audioClient->_receivedAudioStream.parseData(*_queue.front());
|
||||||
|
_queue.pop();
|
||||||
|
}
|
||||||
|
_index = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void AudioClient::handleNoisyMutePacket(QSharedPointer<ReceivedMessage> message) {
|
void AudioClient::handleNoisyMutePacket(QSharedPointer<ReceivedMessage> message) {
|
||||||
if (!_muted) {
|
if (!_muted) {
|
||||||
toggleMute();
|
toggleMute();
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
#include <queue>
|
||||||
|
|
||||||
#include <QtCore/qsystemdetection.h>
|
#include <QtCore/qsystemdetection.h>
|
||||||
#include <QtCore/QByteArray>
|
#include <QtCore/QByteArray>
|
||||||
|
@ -134,6 +135,9 @@ public:
|
||||||
int getOutputStarveDetectionThreshold() { return _outputStarveDetectionThreshold.get(); }
|
int getOutputStarveDetectionThreshold() { return _outputStarveDetectionThreshold.get(); }
|
||||||
void setOutputStarveDetectionThreshold(int threshold) { _outputStarveDetectionThreshold.set(threshold); }
|
void setOutputStarveDetectionThreshold(int threshold) { _outputStarveDetectionThreshold.set(threshold); }
|
||||||
|
|
||||||
|
int getGateThreshold() { return _gate.getThreshold(); }
|
||||||
|
void setGateThreshold(int threshold) { _gate.setThreshold(threshold); }
|
||||||
|
|
||||||
void setPositionGetter(AudioPositionGetter positionGetter) { _positionGetter = positionGetter; }
|
void setPositionGetter(AudioPositionGetter positionGetter) { _positionGetter = positionGetter; }
|
||||||
void setOrientationGetter(AudioOrientationGetter orientationGetter) { _orientationGetter = orientationGetter; }
|
void setOrientationGetter(AudioOrientationGetter orientationGetter) { _orientationGetter = orientationGetter; }
|
||||||
|
|
||||||
|
@ -227,6 +231,27 @@ private:
|
||||||
float azimuthForSource(const glm::vec3& relativePosition);
|
float azimuthForSource(const glm::vec3& relativePosition);
|
||||||
float gainForSource(float distance, float volume);
|
float gainForSource(float distance, float volume);
|
||||||
|
|
||||||
|
class Gate {
|
||||||
|
public:
|
||||||
|
Gate(AudioClient* audioClient, int threshold);
|
||||||
|
|
||||||
|
int getThreshold() { return _threshold; }
|
||||||
|
void setThreshold(int threshold);
|
||||||
|
|
||||||
|
void insert(QSharedPointer<ReceivedMessage> message);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void flush();
|
||||||
|
|
||||||
|
AudioClient* _audioClient;
|
||||||
|
std::queue<QSharedPointer<ReceivedMessage>> _queue;
|
||||||
|
int _index{ 0 };
|
||||||
|
int _threshold;
|
||||||
|
};
|
||||||
|
|
||||||
|
Setting::Handle<int> _gateThreshold;
|
||||||
|
Gate _gate;
|
||||||
|
|
||||||
Mutex _injectorsMutex;
|
Mutex _injectorsMutex;
|
||||||
QByteArray firstInputFrame;
|
QByteArray firstInputFrame;
|
||||||
QAudioInput* _audioInput;
|
QAudioInput* _audioInput;
|
||||||
|
|
Loading…
Reference in a new issue