mirror of https://github.com/f4exb/sdrangel.git
ATV Demod: simplify vertical sync nested ifs
This commit is contained in:
parent
69edfd4bfb
commit
f78c466a92
|
@ -533,42 +533,39 @@ void ATVDemod::demod(Complex& c)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vertical Synchro : 3/4 a line necessary
|
// 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)
|
m_blnVerticalSynchroDetected = true;
|
||||||
{
|
|
||||||
if(m_fltAmpLineAverage<=fltSynchroTrameLevel) //(m_fltLevelSynchroBlack*(float)(m_intColIndex-((m_intNumberSamplePerLine*12)/64)))) //75
|
// 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_fltAmpDelta<=0.0)
|
||||||
|
|
||||||
if (m_intLineIndex % 2 == 0) // even => odd image
|
|
||||||
{
|
{
|
||||||
m_objRegisteredATVScreen->renderImage(0);
|
m_fltAmpDelta=1.0f;
|
||||||
|
|
||||||
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_intRowIndex=m_intImageIndex%2;
|
//Reset extrema
|
||||||
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
|
m_fltEffMin=2000000.0f;
|
||||||
m_intLineIndex = 0;
|
m_fltEffMax=-2000000.0f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_intRowIndex=m_intImageIndex%2;
|
||||||
|
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
|
||||||
|
m_intLineIndex = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue