VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 15:51:47 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2301 from srcejon/freq_scanner

Browse Source 
RemoteTCPSink: Disable IQ compression for RTL0 protocol.
This commit is contained in:
Edouard Griffiths 2024-11-01 17:24:55 +01:00 committed by GitHub
commit e8041308b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channelrx/remotetcpsink/remotetcpsink.cpp
View File

@ -149,6 +149,9 @@ void RemoteTCPSink::start()
m_basebandSink->setBasebandSampleRate(m_basebandSampleRate);
}
MsgConfigureRemoteTCPSink* msg = MsgConfigureRemoteTCPSink::create(m_settings, QStringList(), true, true);
m_basebandSink->getInputMessageQueue()->push(msg);
updatePublicListing();
}

1
plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp
View File

@ -43,6 +43,7 @@ RemoteTCPSinkBaseband::~RemoteTCPSinkBaseband()
void RemoteTCPSinkBaseband::reset()
{
QMutexLocker mutexLocker(&m_mutex);
m_inputMessageQueue.clear();
m_sampleFifo.reset();
m_sink.init();
}

23
plugins/channelrx/remotetcpsink/remotetcpsinksettingsdialog.cpp
View File

@ -32,7 +32,16 @@ RemoteTCPSinkSettingsDialog::RemoteTCPSinkSettingsDialog(RemoteTCPSinkSettings *
ui->maxClients->setValue(m_settings->m_maxClients);
ui->timeLimit->setValue(m_settings->m_timeLimit);
ui->maxSampleRate->setValue(m_settings->m_maxSampleRate);
ui->iqOnly->setChecked(m_settings->m_iqOnly);
if (m_settings->m_protocol == RemoteTCPSinkSettings::RTL0)
{
ui->iqOnly->setChecked(true);
ui->iqOnlyLabel->setEnabled(false);
ui->iqOnly->setEnabled(false);
}
else
{
ui->iqOnly->setChecked(m_settings->m_iqOnly);
}
ui->compressor->setCurrentIndex((int) m_settings->m_compression);
ui->compressionLevel->setValue(m_settings->m_compressionLevel);
@ -40,6 +49,9 @@ RemoteTCPSinkSettingsDialog::RemoteTCPSinkSettingsDialog(RemoteTCPSinkSettings *
ui->certificate->setText(m_settings->m_certificate);
ui->key->setText(m_settings->m_key);
if (m_settings->m_protocol != RemoteTCPSinkSettings::SDRA_WSS) {
ui->sslSettingsGroup->setEnabled(false);
}
ui->publicListing->setChecked(m_settings->m_public);
ui->publicAddress->setText(m_settings->m_publicAddress);
@ -94,10 +106,13 @@ void RemoteTCPSinkSettingsDialog::accept()
m_settings->m_maxSampleRate = ui->maxSampleRate->value();
m_settingsKeys.append("maxSampleRate");
}
if (ui->iqOnly->isChecked() != m_settings->m_iqOnly)
if (m_settings->m_protocol != RemoteTCPSinkSettings::RTL0)
{
m_settings->m_iqOnly = ui->iqOnly->isChecked();
m_settingsKeys.append("iqOnly");
if (ui->iqOnly->isChecked() != m_settings->m_iqOnly)
{
m_settings->m_iqOnly = ui->iqOnly->isChecked();
m_settingsKeys.append("iqOnly");
}
}
RemoteTCPSinkSettings::Compressor compressor = (RemoteTCPSinkSettings::Compressor) ui->compressor->currentIndex();
if (compressor != m_settings->m_compression)

8
plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp
View File

@ -269,7 +269,7 @@ void RemoteTCPSinkSink::processOneSample(Complex &ci)
}
}
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::FLAC))
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::FLAC) && (m_settings.m_protocol != RemoteTCPSinkSettings::RTL0))
{
// Compress using FLAC
FLAC__int32 iqBuf[2];
@ -360,7 +360,7 @@ void RemoteTCPSinkSink::processOneSample(Complex &ci)
int bytes = 2 * m_settings.m_sampleBits / 8;
m_bytesUncompressed += bytes;
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::ZLIB))
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::ZLIB) && (m_settings.m_protocol != RemoteTCPSinkSettings::RTL0))
{
if (m_zStreamInitialised)
{
@ -1027,12 +1027,12 @@ void RemoteTCPSinkSink::acceptConnection(Socket *client)
client->flush();
// Inform client if they are in a queue
if (!m_settings.m_iqOnly && (m_clients.size() > m_settings.m_maxClients)) {
if (!m_settings.m_iqOnly && (m_clients.size() > m_settings.m_maxClients) && (m_settings.m_protocol != RemoteTCPSinkSettings::RTL0)) {
sendQueuePosition(client, m_clients.size() - m_settings.m_maxClients);
}
// Send existing FLAC header to new client
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::FLAC) && (m_flacHeader.size() == m_flacHeaderSize))
if (!m_settings.m_iqOnly && (m_settings.m_compression == RemoteTCPSinkSettings::FLAC) && (m_flacHeader.size() == m_flacHeaderSize) && (m_settings.m_protocol != RemoteTCPSinkSettings::RTL0))
{
char header[1+4];