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 modulator: fixed TV standard setting

Browse Source
This commit is contained in:
f4exb 2019-11-27 01:35:56 +01:00
parent b49e68e77b
commit a5c5790b6f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channeltx/modatv/atvmodsource.cpp
View File

@ -519,7 +519,7 @@ float ATVModSource::getRFBandwidthDivisor(ATVModSettings::ATVModulation modulati
} }
} }
void ATVModSource::applyStandard() void ATVModSource::applyStandard(const ATVModSettings& settings)
{ {
m_pointsPerSync = (uint32_t) ((4.7f / 64.0f) * m_pointsPerLine); m_pointsPerSync = (uint32_t) ((4.7f / 64.0f) * m_pointsPerLine);
m_pointsPerBP = (uint32_t) ((4.7f / 64.0f) * m_pointsPerLine); m_pointsPerBP = (uint32_t) ((4.7f / 64.0f) * m_pointsPerLine);
@ -533,9 +533,9 @@ void ATVModSource::applyStandard()
m_hBarIncrement = m_spanLevel / (float) m_nbBars; m_hBarIncrement = m_spanLevel / (float) m_nbBars;
m_vBarIncrement = m_spanLevel / (float) m_nbBars; m_vBarIncrement = m_spanLevel / (float) m_nbBars;
m_nbLines = m_settings.m_nbLines; m_nbLines = settings.m_nbLines;
m_nbLines2 = m_nbLines / 2; m_nbLines2 = m_nbLines / 2;
m_fps = m_settings.m_fps * 1.0f; m_fps = settings.m_fps * 1.0f;
// qDebug() << "ATVMod::applyStandard: " // qDebug() << "ATVMod::applyStandard: "
// << " m_nbLines: " << m_config.m_nbLines // << " m_nbLines: " << m_config.m_nbLines
@ -545,7 +545,7 @@ void ATVModSource::applyStandard()
// << " m_tvSampleRate: " << m_tvSampleRate // << " m_tvSampleRate: " << m_tvSampleRate
// << " m_pointsPerTU: " << m_pointsPerTU; // << " m_pointsPerTU: " << m_pointsPerTU;
switch(m_settings.m_atvStd) switch(settings.m_atvStd)
{ {
case ATVModSettings::ATVStdHSkip: case ATVModSettings::ATVStdHSkip:
m_nbImageLines = m_nbLines; // lines less the total number of sync lines m_nbImageLines = m_nbLines; // lines less the total number of sync lines
@ -913,7 +913,7 @@ void ATVModSource::applyChannelSettings(int channelSampleRate, int channelFreque
memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1)); memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
m_SSBFilterBufferIndex = 0; m_SSBFilterBufferIndex = 0;
applyStandard(); // set all timings applyStandard(m_settings); // set all timings
m_settingsMutex.unlock(); m_settingsMutex.unlock();
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())
@ -976,7 +976,7 @@ void ATVModSource::applySettings(const ATVModSettings& settings, bool force)
memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1)); memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
m_SSBFilterBufferIndex = 0; m_SSBFilterBufferIndex = 0;
applyStandard(); // set all timings applyStandard(settings); // set all timings
m_settingsMutex.unlock(); m_settingsMutex.unlock();
if (getMessageQueueToGUI()) if (getMessageQueueToGUI())

2
plugins/channeltx/modatv/atvmodsource.h
View File

@ -230,7 +230,7 @@ private:
void modulateSample(); void modulateSample();
Complex& modulateSSB(Real& sample); Complex& modulateSSB(Real& sample);
Complex& modulateVestigialSSB(Real& sample); Complex& modulateVestigialSSB(Real& sample);
void applyStandard(); void applyStandard(const ATVModSettings& settings);
void resizeImage(); void resizeImage();
void calculateVideoSizes(); void calculateVideoSizes();
void resizeVideo(); void resizeVideo();