VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-01 09:16:39 -04:00
Code Issues Projects Releases Wiki Activity

ATV Demod: removed commented code and set rows limit in the right places

Browse Source
This commit is contained in:
f4exb 2017-03-30 10:59:24 +02:00
parent fd70dc30eb
commit 2732bbafe5
1 changed files with 4 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,18 +165,6 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
//********** Accessing ATV Screen context ********** //********** Accessing ATV Screen context **********
if(m_intImageIndex==0)
{
if(m_intNumberOfLines%2==1)
{
m_intRowsLimit = m_intNumberOfLines;
}
else
{
m_intRowsLimit = m_intNumberOfLines-2;
}
}
#ifdef EXTENDED_DIRECT_SAMPLE #ifdef EXTENDED_DIRECT_SAMPLE
qint16 * ptrBuffer; qint16 * ptrBuffer;
@ -452,27 +440,6 @@ void ATVDemod::demod(Complex& c)
////////////////////// //////////////////////
// m_blnSynchroDetected=false;
//
// if (m_intColIndex >= intSynchroTimeSamples)
// {
// //Floor Detection 0
// if (fltVal < m_objRunning.m_fltVoltLevelSynchroTop)
// {
// m_intSynchroPoints++;
// }
// else if (fltVal > m_objRunning.m_fltVoltLevelSynchroBlack)
// {
// m_intSynchroPoints = 0;
// }
//
// if (m_intSynchroPoints > m_intNumberSamplePerTop)
// {
// m_blnSynchroDetected = true;
// m_intSynchroPoints = 0;
// }
// }
// Horizontal Synchro detection // Horizontal Synchro detection
// Floor Detection 0 // Floor Detection 0
@ -547,36 +514,6 @@ void ATVDemod::demod(Complex& c)
} }
} }
// //Horizontal Synchro
// if ((m_blnSynchroDetected)
// || (m_intColIndex >= m_intNumberSamplePerLine + 2)
// || (!m_objRunning.m_blnHSync && (m_intColIndex >= m_intNumberSamplePerLine)))
// {
// if (m_blnSynchroDetected
// && (m_intRowIndex > m_intNumberOfSyncLines)
// && (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;
// }
// else
// {
// m_intColIndex = 0;
// }
//
// m_fltAmpLineAverage=0.0f;
//
// //New line + Interleaving
// m_intRowIndex ++;
// m_intRowIndex ++;
//
// if(m_intRowIndex<m_intNumberOfLines)
// {
// m_objRegisteredATVScreen->selectRow(m_intRowIndex - m_intNumberOfSyncLines);
// }
// }
////////////////////// //////////////////////
if(m_intRowIndex>=m_intRowsLimit) if(m_intRowIndex>=m_intRowsLimit)
@ -604,8 +541,6 @@ void ATVDemod::demod(Complex& c)
m_objRegisteredATVScreen->renderImage(NULL); m_objRegisteredATVScreen->renderImage(NULL);
} }
m_intRowsLimit = m_intNumberOfLines-1;
if (m_objRFRunning.m_enmModulation == ATV_AM) if (m_objRFRunning.m_enmModulation == ATV_AM)
{ {
m_fltAmpMin=m_fltEffMin; m_fltAmpMin=m_fltEffMin;
@ -621,17 +556,12 @@ void ATVDemod::demod(Complex& c)
m_fltEffMin=2000000.0f; m_fltEffMin=2000000.0f;
m_fltEffMax=-2000000.0f; m_fltEffMax=-2000000.0f;
} }
m_intRowsLimit = m_intNumberOfLines - 1; // odd image
} }
else else
{ {
if(m_intNumberOfLines%2==1) m_intRowsLimit = m_intNumberOfLines % 2 == 1 ? m_intNumberOfLines : m_intNumberOfLines-2; // even image
{
m_intRowsLimit = m_intNumberOfLines;
}
else
{
m_intRowsLimit = m_intNumberOfLines-2;
}
} }
m_intImageIndex ++; m_intImageIndex ++;
@ -769,8 +699,8 @@ void ATVDemod::applySettings()
m_intNumberOfLines = (int) (1.0f / (m_objConfig.m_fltLineDuration * m_objConfig.m_fltFramePerS)); m_intNumberOfLines = (int) (1.0f / (m_objConfig.m_fltLineDuration * m_objConfig.m_fltFramePerS));
m_intNumberSamplePerLine = (int) (m_objConfig.m_fltLineDuration * m_objConfig.m_intSampleRate); m_intNumberSamplePerLine = (int) (m_objConfig.m_fltLineDuration * m_objConfig.m_intSampleRate);
m_intNumberOfRowsToDisplay = (int) (m_objConfig.m_fltRatioOfRowsToDisplay * m_objConfig.m_fltLineDuration * m_objConfig.m_intSampleRate); m_intNumberOfRowsToDisplay = (int) (m_objConfig.m_fltRatioOfRowsToDisplay * m_objConfig.m_fltLineDuration * m_objConfig.m_intSampleRate);
m_intNumberSamplePerTop = (int) (m_objConfig.m_fltTopDuration * m_objConfig.m_intSampleRate); m_intNumberSamplePerTop = (int) (m_objConfig.m_fltTopDuration * m_objConfig.m_intSampleRate);
m_intRowsLimit = m_intNumberOfLines % 2 == 1 ? m_intNumberOfLines : m_intNumberOfLines-2; // start with even image
applyStandard(); applyStandard();