VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ATV Demod: simplify vertical sync nested ifs

This commit is contained in:
f4exb 2017-03-30 23:30:07 +02:00
parent 69edfd4bfb
commit f78c466a92
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
plugins/channelrx/demodatv/atvdemod.cpp
View File

@ -533,42 +533,39 @@ void ATVDemod::demod(Complex& c)
}
// Vertical Synchro : 3/4 a line necessary
if(!m_blnVerticalSynchroDetected && m_objRunning.m_blnVSync)
if (!m_blnVerticalSynchroDetected
&& m_objRunning.m_blnVSync
&& (m_intColIndex >= intSynchroTimeSamples)
&& (m_fltAmpLineAverage<=fltSynchroTrameLevel))
{
if(m_intColIndex >= intSynchroTimeSamples)
{
if(m_fltAmpLineAverage<=fltSynchroTrameLevel) //(m_fltLevelSynchroBlack*(float)(m_intColIndex-((m_intNumberSamplePerLine*12)/64)))) //75
m_blnVerticalSynchroDetected = true;
// qDebug("%d: %d: %d", m_intLineIndex, m_intImageIndex, m_intNumberOfLines);
if (m_intLineIndex % 2 == 0) // even => odd image
{
m_objRegisteredATVScreen->renderImage(0);
if (m_objRFRunning.m_enmModulation == ATV_AM)
{
m_blnVerticalSynchroDetected = true;
m_fltAmpMin=m_fltEffMin;
m_fltAmpMax=m_fltEffMax;
m_fltAmpDelta=m_fltEffMax-m_fltEffMin;
// qDebug("%d: %d: %d", m_intLineIndex, m_intImageIndex, m_intNumberOfLines);
if (m_intLineIndex % 2 == 0) // even => odd image
if(m_fltAmpDelta<=0.0)
{
m_objRegisteredATVScreen->renderImage(0);
if (m_objRFRunning.m_enmModulation == ATV_AM)
{
m_fltAmpMin=m_fltEffMin;
m_fltAmpMax=m_fltEffMax;
m_fltAmpDelta=m_fltEffMax-m_fltEffMin;
if(m_fltAmpDelta<=0.0)
{
m_fltAmpDelta=1.0f;
}
//Reset extrema
m_fltEffMin=2000000.0f;
m_fltEffMax=-2000000.0f;
}
m_fltAmpDelta=1.0f;
}
m_intRowIndex=m_intImageIndex%2;
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
m_intLineIndex = 0;
//Reset extrema
m_fltEffMin=2000000.0f;
m_fltEffMax=-2000000.0f;
}
}
m_intRowIndex=m_intImageIndex%2;
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
m_intLineIndex = 0;
}
}