VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 13:12:24 -04:00
Code Issues Projects Releases Wiki Activity

DATV demod: DATVDemodSink: init DATV framework outside process sample loop

Browse Source
This commit is contained in:
f4exb 2021-04-03 06:36:57 +02:00
parent e56abf490f
commit 6b5e11ffe5
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demoddatv/datvdemodsettings.cpp
View File

@ -252,7 +252,6 @@ bool DATVDemodSettings::isDifferent(const DATVDemodSettings& other)
|| (m_softLDPCToolPath != other.m_softLDPCToolPath) || (m_softLDPCToolPath != other.m_softLDPCToolPath)
|| (m_maxBitflips != other.m_maxBitflips) || (m_maxBitflips != other.m_maxBitflips)
|| (m_modulation != other.m_modulation) || (m_modulation != other.m_modulation)
|| (m_standard != other.m_standard)
|| (m_notchFilters != other.m_notchFilters) || (m_notchFilters != other.m_notchFilters)
|| (m_symbolRate != other.m_symbolRate) || (m_symbolRate != other.m_symbolRate)
|| (m_excursion != other.m_excursion) || (m_excursion != other.m_excursion)

40
plugins/channelrx/demoddatv/datvdemodsink.cpp
View File

@ -1280,6 +1280,24 @@ void DATVDemodSink::feed(const SampleVector::const_iterator& begin, const Sample
m_modcodCodeRate = objDemodulatorDVBS2->m_modcodRate; m_modcodCodeRate = objDemodulatorDVBS2->m_modcodRate;
} // DVBS2: Track change of constellation via MODCOD } // DVBS2: Track change of constellation via MODCOD
//********** init leandvb framework **********
if (m_blnNeedConfigUpdate)
{
qDebug("DATVDemodSink::feed: Settings applied. Standard : %d...", m_settings.m_standard);
m_blnNeedConfigUpdate = false;
if(m_settings.m_standard==DATVDemodSettings::DVB_S2)
{
qDebug("DATVDemodSink::feed: init DVBS-2");
InitDATVS2Framework();
}
else
{
qDebug("DATVDemodSink::feed: init DVBS");
InitDATVFramework();
}
}
//********** Bis repetita : Let's rock and roll buddy ! ********** //********** Bis repetita : Let's rock and roll buddy ! **********
#ifdef EXTENDED_DIRECT_SAMPLE #ifdef EXTENDED_DIRECT_SAMPLE
@ -1309,25 +1327,6 @@ void DATVDemodSink::feed(const SampleVector::const_iterator& begin, const Sample
fltI = it->real(); fltI = it->real();
fltQ = it->imag(); fltQ = it->imag();
#endif #endif
//********** demodulation **********
if (m_blnNeedConfigUpdate)
{
qDebug("DATVDemodSink::feed: Settings applied. Standard : %d...", m_settings.m_standard);
m_blnNeedConfigUpdate = false;
if(m_settings.m_standard==DATVDemodSettings::DVB_S2)
{
qDebug("DATVDemodSink::feed: init DVBS-2");
InitDATVS2Framework();
}
else
{
qDebug("DATVDemodSink::feed: init DVBS");
InitDATVFramework();
}
}
//********** iq stream **************** //********** iq stream ****************
Complex objC(fltI,fltQ); Complex objC(fltI,fltQ);
objC *= m_objNCO.nextIQ(); objC *= m_objNCO.nextIQ();
@ -1459,8 +1458,7 @@ void DATVDemodSink::applySettings(const DATVDemodSettings& settings, bool force)
m_udpStream.setPort(settings.m_udpTSPort); m_udpStream.setPort(settings.m_udpTSPort);
} }
if (m_settings.isDifferent(settings) || force) if (m_settings.isDifferent(settings) || force) {
{
m_blnNeedConfigUpdate = true; m_blnNeedConfigUpdate = true;
} }