w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-12 02:32:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle 24hr wrap of QAudioInput::elapsedUSecs() on Linux & Windows

Browse Source
This commit is contained in:
Bill Somerville 2020-08-22 18:09:51 +01:00
parent d522239492
commit d1fa08ab78
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Audio/soundin.cpp
View File

@ -1,5 +1,7 @@
#include "soundin.h" #include "soundin.h"
#include <cstdlib>
#include <cmath>
#include <QAudioDeviceInfo> #include <QAudioDeviceInfo>
#include <QAudioFormat> #include <QAudioFormat>
#include <QAudioInput> #include <QAudioInput>
@ -166,15 +168,21 @@ void SoundInput::reset (bool report_dropped_frames)
{ {
if (m_stream) if (m_stream)
{ {
if (cummulative_lost_usec_ >= 0 // don't report first time as we auto elapsed_usecs = m_stream->elapsedUSecs ();
// don't yet known latency while (std::abs (elapsed_usecs - m_stream->processedUSecs ())
&& report_dropped_frames) > 24 * 60 * 60 * 500000ll) // half day
{ {
auto lost_usec = m_stream->elapsedUSecs () - m_stream->processedUSecs () - cummulative_lost_usec_; // QAudioInput::elapsedUSecs() wraps after 24 hours
elapsed_usecs += 24 * 60 * 60 * 1000000ll;
}
// don't report first time as we don't yet known latency
if (cummulative_lost_usec_ != std::numeric_limits<qint64>::min () && report_dropped_frames)
{
auto lost_usec = elapsed_usecs - m_stream->processedUSecs () - cummulative_lost_usec_;
Q_EMIT dropped_frames (m_stream->format ().framesForDuration (lost_usec), lost_usec); Q_EMIT dropped_frames (m_stream->format ().framesForDuration (lost_usec), lost_usec);
//qDebug () << "SoundInput::reset: frames dropped:" << m_stream->format ().framesForDuration (lost_usec) << "sec:" << lost_usec / 1.e6; //qDebug () << "SoundInput::reset: frames dropped:" << m_stream->format ().framesForDuration (lost_usec) << "sec:" << lost_usec / 1.e6;
} }
cummulative_lost_usec_ = m_stream->elapsedUSecs () - m_stream->processedUSecs (); cummulative_lost_usec_ = elapsed_usecs - m_stream->processedUSecs ();
} }
} }

3
Audio/soundin.h
View File

@ -2,6 +2,7 @@
#ifndef SOUNDIN_H__ #ifndef SOUNDIN_H__
#define SOUNDIN_H__ #define SOUNDIN_H__
#include <limits>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QDateTime> #include <QDateTime>
@ -24,7 +25,7 @@ public:
SoundInput (QObject * parent = nullptr) SoundInput (QObject * parent = nullptr)
: QObject {parent} : QObject {parent}
, m_sink {nullptr} , m_sink {nullptr}
, cummulative_lost_usec_ {0} , cummulative_lost_usec_ {std::numeric_limits<qint64>::min ()}
{ {
} }