From c2d9de192667f04d67d194bd5f3431a71f555ea3 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 2 Apr 2017 22:32:08 +0200 Subject: [PATCH] AM Modulator: new shortest possible vertical sync compatible with ATV demod --- plugins/channeltx/modatv/atvmod.cpp | 15 +++++++++++++++ plugins/channeltx/modatv/atvmod.h | 3 ++- plugins/channeltx/modatv/atvmodgui.ui | 5 +++++ plugins/channeltx/modatv/atvmodplugin.cpp | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index 1258f7300..71f308691 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -826,6 +826,21 @@ void ATVMod::applyStandard() switch(m_config.m_atvStd) { + case ATVStdShortInterleaved: // Follows loosely the 405 lines standard + // what is left in a 64 us line for the image + m_nbImageLines = m_nbLines - 2; // lines less the total number of sync lines + m_nbImageLines2 = m_nbImageLines / 2; + m_interleaved = true; + m_nbSyncLinesHeadE = 1; // number of sync lines on the top of a frame even + m_nbSyncLinesHeadO = 1; // number of sync lines on the top of a frame odd + m_nbSyncLinesBottom = 0; + m_nbLongSyncLines = 1; + m_nbHalfLongSync = 0; + m_nbWholeEqLines = 0; + m_singleLongSync = true; + m_nbBlankLines = 1; + m_blankLineLvel = 0.7f; + break; case ATVStd405: // Follows loosely the 405 lines standard // what is left in a 64 us line for the image m_nbImageLines = m_nbLines - 15; // lines less the total number of sync lines diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index 32be0b50a..d85c30e66 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -42,7 +42,8 @@ public: { ATVStdPAL625, ATVStdPAL525, - ATVStd405 + ATVStd405, + ATVStdShortInterleaved } ATVStd; typedef enum diff --git a/plugins/channeltx/modatv/atvmodgui.ui b/plugins/channeltx/modatv/atvmodgui.ui index c76615c91..a9ebcd29a 100644 --- a/plugins/channeltx/modatv/atvmodgui.ui +++ b/plugins/channeltx/modatv/atvmodgui.ui @@ -629,6 +629,11 @@ 405L + + + SHi + + diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index c597781e5..b4ba0c485 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -23,7 +23,7 @@ const PluginDescriptor ATVModPlugin::m_pluginDescriptor = { QString("ATV Modulator"), - QString("3.3.2"), + QString("3.3.3"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,