VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-21 04:58:38 -05:00
Code Issues Projects Releases Wiki Activity

ATV Demod: set number of lines from standard

Browse Source
This commit is contained in:
f4exb 2017-03-30 22:11:35 +02:00
parent 9f5fd9b211
commit e80d0a5660
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,14 +678,14 @@ void ATVDemod::applySettings()
{ {
m_objSettingsMutex.lock(); m_objSettingsMutex.lock();
m_intNumberOfLines = (int) (1.0f / (m_objConfig.m_fltLineDuration * m_objConfig.m_fltFramePerS)); applyStandard();
//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 m_intRowsLimit = m_intNumberOfLines % 2 == 1 ? m_intNumberOfLines : m_intNumberOfLines-2; // start with even image
applyStandard();
m_objRegisteredATVScreen->resizeATVScreen( m_objRegisteredATVScreen->resizeATVScreen(
m_intNumberSamplePerLine - m_intNumberSamplePerLineSignals, m_intNumberSamplePerLine - m_intNumberSamplePerLineSignals,
m_intNumberOfLines - m_intNumberOfBlackLines); m_intNumberOfLines - m_intNumberOfBlackLines);
@ -758,17 +758,20 @@ void ATVDemod::applyStandard()
switch(m_objConfig.m_enmATVStandard) switch(m_objConfig.m_enmATVStandard)
{ {
case ATVStd405: // Follows loosely the 405 lines standard case ATVStd405: // Follows loosely the 405 lines standard
m_intNumberOfLines = 405;
// what is left in a 64 us line for the image // what is left in a 64 us line for the image
m_intNumberOfSyncLines = 24; // (15+7)*2 - 20 m_intNumberOfSyncLines = 24; // (15+7)*2 - 20
m_intNumberOfBlackLines = 28; // above + 4 m_intNumberOfBlackLines = 28; // above + 4
break; break;
case ATVStdPAL525: // Follows PAL-M standard case ATVStdPAL525: // Follows PAL-M standard
m_intNumberOfLines = 525;
// what is left in a 64/1.008 us line for the image // what is left in a 64/1.008 us line for the image
m_intNumberOfSyncLines = 40; // (15+15)*2 - 20 m_intNumberOfSyncLines = 40; // (15+15)*2 - 20
m_intNumberOfBlackLines = 44; // above + 4 m_intNumberOfBlackLines = 44; // above + 4
break; break;
case ATVStdPAL625: // Follows PAL-B/G/H standard case ATVStdPAL625: // Follows PAL-B/G/H standard
default: default:
m_intNumberOfLines = 625;
// what is left in a 64 us line for the image // what is left in a 64 us line for the image
m_intNumberOfSyncLines = 44; // (15+17)*2 - 20 m_intNumberOfSyncLines = 44; // (15+17)*2 - 20
m_intNumberOfBlackLines = 48; // above + 4 m_intNumberOfBlackLines = 48; // above + 4