VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-03 13:11:20 -05:00
Code Issues Projects Releases Wiki Activity

ATV Demod: reorder horizontal sync, pixel write and vertical sync and image rendering

Browse Source
This commit is contained in:
f4exb 2017-03-30 21:34:19 +02:00
parent d8905b3e46
commit e270529167
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,6 +442,60 @@ void ATVDemod::demod(Complex& c)
m_blnSynchroDetected = (m_intSynchroPoints == m_intNumberSamplePerTop); m_blnSynchroDetected = (m_intSynchroPoints == m_intNumberSamplePerTop);
//Horizontal Synchro processing
bool blnNewLine = false;
if (!m_objRunning.m_blnHSync && (m_intColIndex >= m_intNumberSamplePerLine)) // H Sync not active
{
m_intColIndex = 0;
blnNewLine = true;
}
else if (m_blnSynchroDetected // Valid H sync detected
//&& (m_intRowIndex > m_intNumberOfSyncLines) // FIXME: remove ?
&& (m_intColIndex > m_intNumberSamplePerLine - m_intNumberSamplePerTop)
&& (m_intColIndex < m_intNumberSamplePerLine + m_intNumberSamplePerTop))
{
m_intAvgColIndex = m_objAvgColIndex.run(m_intColIndex);
m_intColIndex = m_intColIndex - m_intAvgColIndex;
blnNewLine = true;
}
else if (m_intColIndex >= m_intNumberSamplePerLine + 2) // No valid H sync
{
m_intColIndex = 0;
blnNewLine = true;
}
if (blnNewLine)
{
m_fltAmpLineAverage=0.0f;
//New line + Interleaving
m_intRowIndex ++;
m_intRowIndex ++;
if(m_intRowIndex<m_intNumberOfLines)
{
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
}
m_intLineIndex++;
}
//********** Filling pixels **********
if (!blnComputeImage)
{
blnComputeImage = ((m_intImageIndex/2) % 2 == 0);
}
if (blnComputeImage)
{
m_objRegisteredATVScreen->setDataColor(m_intColIndex - m_intNumberSaplesPerHSync + m_intNumberSamplePerTop, intVal, intVal, intVal);
}
m_intColIndex++;
//********** Rendering if necessary ********** //********** Rendering if necessary **********
// Vertical Synchro : 3/4 a line necessary // Vertical Synchro : 3/4 a line necessary
@ -513,59 +567,6 @@ void ATVDemod::demod(Complex& c)
m_intImageIndex ++; m_intImageIndex ++;
} }
//Horizontal Synchro processing
bool blnNewLine = false;
if (!m_objRunning.m_blnHSync && (m_intColIndex >= m_intNumberSamplePerLine)) // H Sync not active
{
m_intColIndex = 0;
blnNewLine = true;
}
else if (m_blnSynchroDetected // Valid H sync detected
//&& (m_intRowIndex > m_intNumberOfSyncLines) // FIXME: remove ?
&& (m_intColIndex > m_intNumberSamplePerLine - m_intNumberSamplePerTop)
&& (m_intColIndex < m_intNumberSamplePerLine + m_intNumberSamplePerTop))
{
m_intAvgColIndex = m_objAvgColIndex.run(m_intColIndex);
m_intColIndex = m_intColIndex - m_intAvgColIndex;
blnNewLine = true;
}
else if (m_intColIndex >= m_intNumberSamplePerLine + 2) // No valid H sync
{
m_intColIndex = 0;
blnNewLine = true;
}
if (blnNewLine)
{
m_fltAmpLineAverage=0.0f;
//New line + Interleaving
m_intRowIndex ++;
m_intRowIndex ++;
if(m_intRowIndex<m_intNumberOfLines)
{
m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
}
m_intLineIndex++;
}
//********** Filling pixels **********
if (!blnComputeImage)
{
blnComputeImage = ((m_intImageIndex/2) % 2 == 0);
}
if (blnComputeImage)
{
m_objRegisteredATVScreen->setDataColor(m_intColIndex - m_intNumberSaplesPerHSync + m_intNumberSamplePerTop, intVal, intVal, intVal);
}
m_intColIndex++;
} }
void ATVDemod::start() void ATVDemod::start()