w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-26 14:08:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logging of missing/extra audio input samples

Browse Source 
These warnings and errors  now go to the the system  log rather than a
MessageBox.
This commit is contained in:
Bill Somerville 2020-11-14 20:50:27 +00:00
parent 9417dee4a8
commit 21e7560b89
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Audio/soundin.cpp
View File

@ -2,12 +2,15 @@
#include <cstdlib> #include <cstdlib>
#include <cmath> #include <cmath>
#include <iomanip>
#include <QAudioDeviceInfo> #include <QAudioDeviceInfo>
#include <QAudioFormat> #include <QAudioFormat>
#include <QAudioInput> #include <QAudioInput>
#include <QSysInfo> #include <QSysInfo>
#include <QDebug> #include <QDebug>
#include "Logger.hpp"
#include "moc_soundin.cpp" #include "moc_soundin.cpp"
bool SoundInput::checkStream () bool SoundInput::checkStream ()
@ -178,8 +181,18 @@ void SoundInput::reset (bool report_dropped_frames)
if (cummulative_lost_usec_ != std::numeric_limits<qint64>::min () && report_dropped_frames) if (cummulative_lost_usec_ != std::numeric_limits<qint64>::min () && report_dropped_frames)
{ {
auto lost_usec = elapsed_usecs - m_stream->processedUSecs () - cummulative_lost_usec_; auto lost_usec = elapsed_usecs - m_stream->processedUSecs () - cummulative_lost_usec_;
Q_EMIT dropped_frames (m_stream->format ().framesForDuration (lost_usec), lost_usec); if (std::abs (lost_usec) > 48000 / 5)
//qDebug () << "SoundInput::reset: frames dropped:" << m_stream->format ().framesForDuration (lost_usec) << "sec:" << lost_usec / 1.e6; {
LOG_WARN ("Detected dropped audio source samples: "
<< m_stream->format ().framesForDuration (lost_usec)
<< " (" << std::setprecision (4) << lost_usec / 1.e6 << " S)")
}
else if (std::abs (lost_usec) > 5 * 48000)
{
LOG_ERROR ("Detected excessive dropped audio source samples: "
<< m_stream->format ().framesForDuration (lost_usec)
<< " (" << std::setprecision (4) << lost_usec / 1.e6 << " S)")
}
} }
cummulative_lost_usec_ = elapsed_usecs - m_stream->processedUSecs (); cummulative_lost_usec_ = elapsed_usecs - m_stream->processedUSecs ();
} }

1
Audio/soundin.h
View File

@ -40,7 +40,6 @@ public:
Q_SIGNAL void error (QString message) const; Q_SIGNAL void error (QString message) const;
Q_SIGNAL void status (QString message) const; Q_SIGNAL void status (QString message) const;
Q_SIGNAL void dropped_frames (qint32 dropped, qint64 usec);
private: private:
// used internally // used internally

19
widgets/mainwindow.cpp
View File

@ -480,23 +480,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect(m_soundInput, &SoundInput::error, this, &MainWindow::showSoundInError); connect(m_soundInput, &SoundInput::error, this, &MainWindow::showSoundInError);
connect(m_soundInput, &SoundInput::error, &m_config, &Configuration::invalidate_audio_input_device); connect(m_soundInput, &SoundInput::error, &m_config, &Configuration::invalidate_audio_input_device);
// connect(m_soundInput, &SoundInput::status, this, &MainWindow::showStatusMessage); // connect(m_soundInput, &SoundInput::status, this, &MainWindow::showStatusMessage);
connect (m_soundInput, &SoundInput::dropped_frames, this, [this] (qint32 dropped_frames, qint64 usec) {
if (dropped_frames > 48000 / 5) // 1/5 second
{
showStatusMessage (tr ("%1 (%2 sec) audio frames dropped").arg (dropped_frames).arg (usec / 1.e6, 5, 'f', 3));
}
if (dropped_frames > 5 * 48000) // seconds
{
auto period = qt_truncate_date_time_to (QDateTime::currentDateTimeUtc ().addMSecs (-m_TRperiod / 2.), m_TRperiod * 1e3);
MessageBox::warning_message (this
, tr ("Audio Source")
, tr ("Reduce system load")
, tr ("Excessive dropped samples - %1 (%2 sec) audio frames dropped in period starting %3")
.arg (dropped_frames)
.arg (usec / 1.e6, 5, 'f', 3)
.arg (period.toString ("hh:mm:ss")));
}
});
connect (&m_audioThread, &QThread::finished, m_soundInput, &QObject::deleteLater); connect (&m_audioThread, &QThread::finished, m_soundInput, &QObject::deleteLater);
connect (this, &MainWindow::finished, this, &MainWindow::close); connect (this, &MainWindow::finished, this, &MainWindow::close);
@ -1563,7 +1546,7 @@ void MainWindow::dataSink(qint64 frames)
if(m_mode=="FT8" and !m_diskData and (m_ihsym==m_earlyDecode or m_ihsym==m_earlyDecode2)) return; if(m_mode=="FT8" and !m_diskData and (m_ihsym==m_earlyDecode or m_ihsym==m_earlyDecode2)) return;
if (!m_diskData) if (!m_diskData)
{ {
Q_EMIT reset_audio_input_stream (true); // signals dropped samples Q_EMIT reset_audio_input_stream (true); // reports dropped samples
} }
if(!m_diskData and (m_saveAll or m_saveDecoded or m_mode=="WSPR" or m_mode=="FST4W")) { if(!m_diskData and (m_saveAll or m_saveDecoded or m_mode=="WSPR" or m_mode=="FST4W")) {
//Always save unless "Save None"; may delete later //Always save unless "Save None"; may delete later