mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-05 03:09:08 -04:00
ATV Demod: changed some attribute names
This commit is contained in:
parent
cade50d9f0
commit
7e8d9889cd
@ -37,8 +37,8 @@ ATVDemod::ATVDemod() :
|
|||||||
m_blnSynchroDetected(false),
|
m_blnSynchroDetected(false),
|
||||||
m_blnLineSynchronized(false),
|
m_blnLineSynchronized(false),
|
||||||
m_blnVerticalSynchroDetected(false),
|
m_blnVerticalSynchroDetected(false),
|
||||||
m_fltLevelSynchroTop(0.0),
|
m_fltVoltLevelSynchroTop(0.0),
|
||||||
m_fltLevelSynchroBlack(1.0),
|
m_fltVoltLevelSynchroBlack(1.0),
|
||||||
m_enmModulation(ATV_FM1),
|
m_enmModulation(ATV_FM1),
|
||||||
m_intRowsLimit(0),
|
m_intRowsLimit(0),
|
||||||
m_blnImageDetecting(false),
|
m_blnImageDetecting(false),
|
||||||
@ -112,8 +112,8 @@ void ATVDemod::InitATVParameters(
|
|||||||
m_intNumberSamplePerTop=0;
|
m_intNumberSamplePerTop=0;
|
||||||
m_intNumberOfLines=0;
|
m_intNumberOfLines=0;
|
||||||
|
|
||||||
m_fltLevelSynchroTop=0.0;
|
m_fltVoltLevelSynchroTop=0.0;
|
||||||
m_fltLevelSynchroBlack=1.0;
|
m_fltVoltLevelSynchroBlack=1.0;
|
||||||
|
|
||||||
m_blnInitialized=false;
|
m_blnInitialized=false;
|
||||||
m_objSettingsMutex.unlock();
|
m_objSettingsMutex.unlock();
|
||||||
@ -121,8 +121,8 @@ void ATVDemod::InitATVParameters(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_fltLevelSynchroTop = fltVoltLevelSynchroTop;
|
m_fltVoltLevelSynchroTop = fltVoltLevelSynchroTop;
|
||||||
m_fltLevelSynchroBlack = fltVoltLevelSynchroBlack;
|
m_fltVoltLevelSynchroBlack = fltVoltLevelSynchroBlack;
|
||||||
|
|
||||||
intNumberSamplePerLine=(int)((fltLineTimeUs*fltSampling)/fltSecondToUs);
|
intNumberSamplePerLine=(int)((fltLineTimeUs*fltSampling)/fltSecondToUs);
|
||||||
intNumberOfLines=(int)((fltSecondToUs/fltImagesPerSeconds)/round(fltLineTimeUs));
|
intNumberOfLines=(int)((fltSecondToUs/fltImagesPerSeconds)/round(fltLineTimeUs));
|
||||||
@ -153,8 +153,8 @@ void ATVDemod::InitATVParameters(
|
|||||||
|
|
||||||
//Mise à jour de la config
|
//Mise à jour de la config
|
||||||
m_objRunning.m_enmModulation = m_enmModulation;
|
m_objRunning.m_enmModulation = m_enmModulation;
|
||||||
m_objRunning.m_fltVoltLevelSynchroBlack = m_fltLevelSynchroBlack;
|
m_objRunning.m_fltVoltLevelSynchroBlack = m_fltVoltLevelSynchroBlack;
|
||||||
m_objRunning.m_fltVoltLevelSynchroTop = m_fltLevelSynchroTop;
|
m_objRunning.m_fltVoltLevelSynchroTop = m_fltVoltLevelSynchroTop;
|
||||||
m_objRunning.m_intFramePerS = intFramePerS;
|
m_objRunning.m_intFramePerS = intFramePerS;
|
||||||
m_objRunning.m_intLineDurationUs = intLineDurationUs;
|
m_objRunning.m_intLineDurationUs = intLineDurationUs;
|
||||||
m_objRunning.m_intTopDurationUs = intTopDurationUs;
|
m_objRunning.m_intTopDurationUs = intTopDurationUs;
|
||||||
@ -182,7 +182,7 @@ void ATVDemod::InitATVParameters(
|
|||||||
|
|
||||||
void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
|
void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst)
|
||||||
{
|
{
|
||||||
float fltDivSynchroBlack=1.0f-m_fltLevelSynchroBlack;
|
float fltDivSynchroBlack=1.0f-m_fltVoltLevelSynchroBlack;
|
||||||
float fltI;
|
float fltI;
|
||||||
float fltQ;
|
float fltQ;
|
||||||
float fltNormI;
|
float fltNormI;
|
||||||
@ -197,7 +197,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
|
|||||||
bool blnComputeImage=false;
|
bool blnComputeImage=false;
|
||||||
|
|
||||||
int intSynchroTimeSamples= (3*m_intNumberSamplePerLine)/4;
|
int intSynchroTimeSamples= (3*m_intNumberSamplePerLine)/4;
|
||||||
float fltSynchroTrameLevel = 0.5f*((float)intSynchroTimeSamples)*m_fltLevelSynchroBlack;
|
float fltSynchroTrameLevel = 0.5f*((float)intSynchroTimeSamples)*m_fltVoltLevelSynchroBlack;
|
||||||
|
|
||||||
//********** Let's rock and roll buddy ! **********
|
//********** Let's rock and roll buddy ! **********
|
||||||
|
|
||||||
@ -335,7 +335,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
|
|||||||
|
|
||||||
//********** gray level **********
|
//********** gray level **********
|
||||||
//-0.3 -> 0.7
|
//-0.3 -> 0.7
|
||||||
intVal = (int) 255.0*(fltVal-m_fltLevelSynchroBlack)/fltDivSynchroBlack;
|
intVal = (int) 255.0*(fltVal-m_fltVoltLevelSynchroBlack)/fltDivSynchroBlack;
|
||||||
|
|
||||||
//0 -> 255
|
//0 -> 255
|
||||||
if(intVal<0)
|
if(intVal<0)
|
||||||
@ -376,7 +376,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
|
|||||||
if(m_blnImageDetecting==false)
|
if(m_blnImageDetecting==false)
|
||||||
{
|
{
|
||||||
//Floor Detection 0
|
//Floor Detection 0
|
||||||
if(fltVal<=m_fltLevelSynchroTop)
|
if(fltVal<=m_fltVoltLevelSynchroTop)
|
||||||
{
|
{
|
||||||
m_intSynchroPoints ++;
|
m_intSynchroPoints ++;
|
||||||
}
|
}
|
||||||
@ -395,7 +395,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
//Image detection Sub Black 0.3
|
//Image detection Sub Black 0.3
|
||||||
if(fltVal>=m_fltLevelSynchroBlack)
|
if(fltVal>=m_fltVoltLevelSynchroBlack)
|
||||||
{
|
{
|
||||||
m_intSynchroPoints ++;
|
m_intSynchroPoints ++;
|
||||||
}
|
}
|
||||||
|
@ -118,8 +118,8 @@ private:
|
|||||||
bool m_blnInitialized;
|
bool m_blnInitialized;
|
||||||
int m_intNumberOfRowsToDisplay;
|
int m_intNumberOfRowsToDisplay;
|
||||||
|
|
||||||
float m_fltLevelSynchroTop;
|
float m_fltVoltLevelSynchroTop;
|
||||||
float m_fltLevelSynchroBlack;
|
float m_fltVoltLevelSynchroBlack;
|
||||||
|
|
||||||
ATVModulation m_enmModulation;
|
ATVModulation m_enmModulation;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user