VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 06:54:39 -04:00
Code Issues Projects Releases Wiki Activity

Deep redesign: revised RTLSDR source serialization. Optimisation of data to blob serialization

Browse Source
This commit is contained in:
f4exb
2015-08-28 03:20:00 +02:00
parent 5f0056f442
commit 77fed9a1c7
7 changed files with 94 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+24 -29
View File
@@ -22,7 +22,7 @@
#include "rtlsdrthread.h"
#include "rtlsdrgui.h"
#include "dsp/dspcommands.h"
#include "util/simpleserializer.h"
#include "rtlsdrserializer.h"
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgConfigureRTLSDR, Message)
MESSAGE_CLASS_DEFINITION(RTLSDRInput::MsgReportRTLSDR, Message)
@@ -47,39 +47,34 @@ void RTLSDRInput::Settings::resetToDefaults()
QByteArray RTLSDRInput::Settings::serialize() const
{
SimpleSerializer s(1);
s.writeS32(1, m_devSampleRate);
s.writeU64(2, m_centerFrequency);
s.writeS32(3, m_gain);
s.writeS32(4, m_loPpmCorrection);
s.writeU32(5, m_log2Decim);
return s.final();
SampleSourceSerializer::Data data;
data.m_lnaGain = m_gain;
data.m_log2Decim = m_log2Decim;
data.m_frequency = m_centerFrequency;
data.m_rate = m_devSampleRate;
data.m_correction = m_loPpmCorrection;
QByteArray byteArray;
RTLSDRSerializer::writeSerializedData(data, byteArray);
return byteArray;
}
bool RTLSDRInput::Settings::deserialize(const QByteArray& data)
bool RTLSDRInput::Settings::deserialize(const QByteArray& serializedData)
{
SimpleDeserializer d(data);
SampleSourceSerializer::Data data;
if (!d.isValid())
{
resetToDefaults();
return false;
}
bool valid = RTLSDRSerializer::readSerializedData(serializedData, data);
if(d.getVersion() == 1)
{
d.readS32(1, &m_devSampleRate, 1024*1000);
d.readU64(2, &m_centerFrequency, 435000*1000);
d.readS32(3, &m_gain, 0);
d.readS32(4, &m_loPpmCorrection, 0);
d.readU32(5, &m_log2Decim, 4);
return true;
}
else
{
resetToDefaults();
return false;
}
m_gain = data.m_lnaGain;
m_log2Decim = data.m_log2Decim;
m_centerFrequency = data.m_frequency;
m_devSampleRate = data.m_rate;
m_loPpmCorrection = data.m_correction;
return valid;
}
RTLSDRInput::RTLSDRInput() :