VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-07 00:02:31 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemonSinkGui: removed rate control code

Browse Source
This commit is contained in:
f4exb 2018-09-04 15:02:45 +02:00
parent 5cf060f4d6
commit 7146225222
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
View File

@ -58,9 +58,6 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_lastCountUnrecoverable = 0; m_lastCountUnrecoverable = 0;
m_lastCountRecovered = 0; m_lastCountRecovered = 0;
m_lastSampleCount = 0; m_lastSampleCount = 0;
m_lastTimestampRateCorrection = 0;
m_nbSamplesSinceRateCorrection = 0;
m_chunkSizeCorrection = 0;
m_resetCounts = true; m_resetCounts = true;
m_paletteGreenText.setColor(QPalette::WindowText, Qt::green); m_paletteGreenText.setColor(QPalette::WindowText, Qt::green);
@ -446,9 +443,6 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
{ {
if (m_doApplySettings) if (m_doApplySettings)
{ {
m_nbSamplesSinceRateCorrection = 0;
m_lastTimestampRateCorrection = 0;
SDRdaemonSinkOutput::MsgStartStop *message = SDRdaemonSinkOutput::MsgStartStop::create(checked); SDRdaemonSinkOutput::MsgStartStop *message = SDRdaemonSinkOutput::MsgStartStop::create(checked);
m_deviceSampleSink->getInputMessageQueue()->push(message); m_deviceSampleSink->getInputMessageQueue()->push(message);
} }
@ -598,22 +592,6 @@ void SDRdaemonSinkGui::analyzeApiReply(const QJsonObject& jsonObject)
{ {
ui->allFramesDecoded->setStyleSheet("QToolButton { background-color : blue; }"); ui->allFramesDecoded->setStyleSheet("QToolButton { background-color : blue; }");
} }
else
{
if (m_lastTimestampRateCorrection == 0) {
m_lastTimestampRateCorrection = timestampUs;
}
//if ((timestampUs - m_lastTimestampRateCorrection > 300e6) && ((queueLengthPercent > 60) || (queueLengthPercent < 40)))
if ((m_nbSamplesSinceRateCorrection > 20000000) && ((queueLengthPercent > 60) || (queueLengthPercent < 40)))
{
sampleRateCorrection(queueLength, queueSize, timestampUs - m_lastTimestampRateCorrection);
m_lastTimestampRateCorrection = timestampUs;
m_nbSamplesSinceRateCorrection = 0;
}
m_nbSamplesSinceRateCorrection += sampleCountDelta;
}
double remoteStreamRate = sampleCountDelta*1e6 / (double) (timestampUs - m_lastTimestampUs); double remoteStreamRate = sampleCountDelta*1e6 / (double) (timestampUs - m_lastTimestampUs);
@ -652,17 +630,3 @@ void SDRdaemonSinkGui::analyzeApiReply(const QJsonObject& jsonObject)
ui->infoText->setText(infoLine); ui->infoText->setText(infoLine);
} }
} }
void SDRdaemonSinkGui::sampleRateCorrection(int queueLength, int queueSize, int64_t timeDeltaUs)
{
int nbBlocksDiff = queueLength - (queueSize/2);
int nbSamplesDiff = nbBlocksDiff * 127 * 127;
float sampleCorr = (nbSamplesDiff * 50000.0) / timeDeltaUs; // correction for ~50ms chunks (50000 us)
int chunkCorr = -roundf(sampleCorr);
m_chunkSizeCorrection += chunkCorr;
// qDebug("SDRdaemonSinkGui::sampleRateCorrection: %d (%d) samples", m_chunkSizeCorrection, chunkCorr);
//
// SDRdaemonSinkOutput::MsgConfigureSDRdaemonSinkChunkCorrection* message = SDRdaemonSinkOutput::MsgConfigureSDRdaemonSinkChunkCorrection::create(m_chunkSizeCorrection);
// m_deviceSampleSink->getInputMessageQueue()->push(message);
}

4
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
View File

@ -111,9 +111,6 @@ private:
uint32_t m_lastCountRecovered; uint32_t m_lastCountRecovered;
uint32_t m_lastSampleCount; uint32_t m_lastSampleCount;
uint64_t m_lastTimestampUs; uint64_t m_lastTimestampUs;
uint64_t m_lastTimestampRateCorrection;
uint32_t m_nbSamplesSinceRateCorrection;
int m_chunkSizeCorrection;
bool m_resetCounts; bool m_resetCounts;
QTime m_time; QTime m_time;
@ -137,7 +134,6 @@ private:
void displayEventStatus(int recoverableCount, int unrecoverableCount); void displayEventStatus(int recoverableCount, int unrecoverableCount);
void displayEventTimer(); void displayEventTimer();
void analyzeApiReply(const QJsonObject& jsonObject); void analyzeApiReply(const QJsonObject& jsonObject);
void sampleRateCorrection(int queueLength, int queueSize, int64_t timeDeltaUs);
private slots: private slots:
void handleInputMessages(); void handleInputMessages();