Browse Source

Audio Device: Add method to calculate output latency.

chirpmodem-v8.0.0
Jon Beniston 1 month ago
parent
commit
864812c2c1
  1. 6
      sdrbase/audio/audiodevicemanager.cpp
  2. 1
      sdrbase/audio/audiodevicemanager.h
  3. 4
      sdrbase/audio/audiooutputdevice.cpp
  4. 4
      sdrbase/audio/audiooutputdevice.h

6
sdrbase/audio/audiodevicemanager.cpp

@ -627,6 +627,12 @@ int AudioDeviceManager::getInputSampleRate(int inputDeviceIndex) @@ -627,6 +627,12 @@ int AudioDeviceManager::getInputSampleRate(int inputDeviceIndex)
}
}
double AudioDeviceManager::getOutputLatency(int outputDeviceIndex)
{
QMap<int, AudioOutputDevice*>::const_iterator it = m_audioOutputs.constFind(outputDeviceIndex);
return it != m_audioOutputs.constEnd() ? it.value()->getLatency() : 0.0;
}
int AudioDeviceManager::getOutputSampleRate(int outputDeviceIndex)
{
QString deviceName;

1
sdrbase/audio/audiodevicemanager.h

@ -117,6 +117,7 @@ public: @@ -117,6 +117,7 @@ public:
bool getOutputDeviceInfo(const QString& deviceName, OutputDeviceInfo& deviceInfo) const;
int getInputSampleRate(int inputDeviceIndex = -1);
int getOutputSampleRate(int outputDeviceIndex = -1);
double getOutputLatency(int outputDeviceIndex = -1); //!< Seconds the device buffers audio, if it's running
void setInputDeviceInfo(int inputDeviceIndex, const InputDeviceInfo& deviceInfo);
void setOutputDeviceInfo(int outputDeviceIndex, const OutputDeviceInfo& deviceInfo);
void unsetInputDeviceInfo(int inputDeviceIndex);

4
sdrbase/audio/audiooutputdevice.cpp

@ -54,6 +54,7 @@ AudioOutputDevice::AudioOutputDevice() : @@ -54,6 +54,7 @@ AudioOutputDevice::AudioOutputDevice() :
m_recordSilenceNbSamples(0),
m_recordSilenceCount(0),
m_audioFifos(),
m_latency(0.0),
m_managerMessageQueue(nullptr)
{
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
@ -176,7 +177,8 @@ bool AudioOutputDevice::start(int deviceIndex, int sampleRate) @@ -176,7 +177,8 @@ bool AudioOutputDevice::start(int deviceIndex, int sampleRate)
if (m_audioOutput->state() != QAudio::ActiveState) {
qWarning() << "AudioOutputDevice::start: cannot start - " << m_audioOutput->error();
} else {
qDebug("AudioOutputDevice::start: started buffer: %d bytes", (int)m_audioOutput->bufferSize());
m_latency = m_audioOutput->bufferSize() / (4.0 * m_audioFormat.sampleRate()); // 16-bit stereo
qDebug("AudioOutputDevice::start: started buffer: %d bytes (%.0f ms)", (int)m_audioOutput->bufferSize(), m_latency * 1e3);
}
if (m_managerMessageQueue) {

4
sdrbase/audio/audiooutputdevice.h

@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <QRecursiveMutex>
#include <QIODevice>
#include <QAudioFormat>
#include <atomic>
#include <list>
#include <vector>
#include <stdint.h>
@ -130,6 +131,8 @@ public: @@ -130,6 +131,8 @@ public:
int getNbFifos() const { return m_audioFifos.size(); }
unsigned int getRate() const { return m_audioFormat.sampleRate(); }
//! Seconds of audio the device buffers after taking it from the FIFOs, roughly: its buffer size
double getLatency() const { return m_latency; }
void setOnExit(bool onExit) { m_onExit = onExit; }
void setUdpDestination(const QString& address, uint16_t port);
@ -170,6 +173,7 @@ private: @@ -170,6 +173,7 @@ private:
std::list<AudioFifo*> m_audioFifos;
std::vector<qint32> m_mixBuffer;
std::atomic<double> m_latency;
QAudioFormat m_audioFormat;
QString m_deviceName;

Loading…
Cancel
Save