From 864812c2c17c19ea35c25e69a712776b5a77da0b Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Sun, 11 Oct 2026 11:55:36 +0100 Subject: [PATCH] Audio Device: Add method to calculate output latency. --- sdrbase/audio/audiodevicemanager.cpp | 6 ++++++ sdrbase/audio/audiodevicemanager.h | 1 + sdrbase/audio/audiooutputdevice.cpp | 4 +++- sdrbase/audio/audiooutputdevice.h | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sdrbase/audio/audiodevicemanager.cpp b/sdrbase/audio/audiodevicemanager.cpp index e89a95ba0..fba0f0d77 100644 --- a/sdrbase/audio/audiodevicemanager.cpp +++ b/sdrbase/audio/audiodevicemanager.cpp @@ -627,6 +627,12 @@ int AudioDeviceManager::getInputSampleRate(int inputDeviceIndex) } } +double AudioDeviceManager::getOutputLatency(int outputDeviceIndex) +{ + QMap::const_iterator it = m_audioOutputs.constFind(outputDeviceIndex); + return it != m_audioOutputs.constEnd() ? it.value()->getLatency() : 0.0; +} + int AudioDeviceManager::getOutputSampleRate(int outputDeviceIndex) { QString deviceName; diff --git a/sdrbase/audio/audiodevicemanager.h b/sdrbase/audio/audiodevicemanager.h index ca78191eb..03f10b306 100644 --- a/sdrbase/audio/audiodevicemanager.h +++ b/sdrbase/audio/audiodevicemanager.h @@ -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); diff --git a/sdrbase/audio/audiooutputdevice.cpp b/sdrbase/audio/audiooutputdevice.cpp index 58ca17edc..265dd718c 100644 --- a/sdrbase/audio/audiooutputdevice.cpp +++ b/sdrbase/audio/audiooutputdevice.cpp @@ -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) 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) { diff --git a/sdrbase/audio/audiooutputdevice.h b/sdrbase/audio/audiooutputdevice.h index e07d47090..ba46f2e38 100644 --- a/sdrbase/audio/audiooutputdevice.h +++ b/sdrbase/audio/audiooutputdevice.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -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: std::list m_audioFifos; std::vector m_mixBuffer; + std::atomic m_latency; QAudioFormat m_audioFormat; QString m_deviceName;