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

Merge branch 'dev' of /shared/development/sdrangel into dev

This commit is contained in:
f4exb 2017-04-05 21:30:14 +02:00
parent 7abbcd9bb4 fcd18ba821
commit 78068af15c
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,30 +645,35 @@ void ATVDemod::applyStandard()
// what is left in a line for the image
m_intNumberOfSyncLines = 0;
m_intNumberOfBlackLines = 0;
m_intNumberOfEqLines = 0; // not applicable
m_interleaved = false;
break;
case ATVStdShort:
// what is left in a line for the image
m_intNumberOfSyncLines = 4;
m_intNumberOfBlackLines = 4;
m_intNumberOfEqLines = 0;
m_interleaved = false;
break;
case ATVStdShortInterleaved:
// what is left in a line for the image
m_intNumberOfSyncLines = 4;
m_intNumberOfBlackLines = 4;
m_intNumberOfEqLines = 0;
m_interleaved = true;
break;
case ATVStd405: // Follows loosely the 405 lines standard
// what is left in a ine for the image
m_intNumberOfSyncLines = 24; // (15+7)*2 - 20
m_intNumberOfBlackLines = 28; // above + 4
m_intNumberOfEqLines = 3;
m_interleaved = true;
break;
case ATVStdPAL525: // Follows PAL-M standard
// what is left in a 64/1.008 us line for the image
m_intNumberOfSyncLines = 40; // (15+15)*2 - 20
m_intNumberOfBlackLines = 44; // above + 4
m_intNumberOfEqLines = 3;
m_interleaved = true;
break;
case ATVStdPAL625: // Follows PAL-B/G/H standard
@ -676,6 +681,7 @@ void ATVDemod::applyStandard()
// what is left in a 64 us line for the image
m_intNumberOfSyncLines = 44; // (15+17)*2 - 20
m_intNumberOfBlackLines = 48; // above + 4
m_intNumberOfEqLines = 3;
m_interleaved = true;
}

1
plugins/channelrx/demodatv/atvdemod.h
View File

@ -350,6 +350,7 @@ private:
int m_intNumberOfLines;
int m_intNumberOfSyncLines; //!< this is the number of non displayable lines at the start of a frame. First displayable row comes next.
int m_intNumberOfBlackLines; //!< this is the total number of lines not part of the image and is used for vertical screen size
int m_intNumberOfEqLines; //!< number of equalizing lines both whole and partial
int m_intNumberSamplePerLineSignals; //!< number of samples in the non image part of the line (signals)
int m_intNumberSaplesPerHSync; //!< number of samples per horizontal synchronization pattern (pulse + back porch)
bool m_interleaved; //!< interleaved image