From 62ab9b2f291748f1c7ae35ddd79456f697ede891 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 6 Mar 2017 03:36:02 +0100
Subject: [PATCH] ATV Demod: correction for AM sync (F4HKW)

---
 plugins/channelrx/demodatv/atvdemod.cpp       | 32 +++++++++++--------
 plugins/channelrx/demodatv/atvdemodplugin.cpp |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp
index d75ee19a1..8c3cda96e 100644
--- a/plugins/channelrx/demodatv/atvdemod.cpp
+++ b/plugins/channelrx/demodatv/atvdemod.cpp
@@ -50,7 +50,7 @@ ATVDemod::ATVDemod() :
     m_fltAmpLineAverage(0.0f),
     m_intNumberSamplePerTop(0)
 {
-	setObjectName("ATVDemod");
+    setObjectName("ATVDemod");
 
     //*************** ATV PARAMETERS  ***************
     m_intNumberSamplePerLine=0;
@@ -226,6 +226,7 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
         ptrBuffer ++;
         fltQ= ((qint32) (*ptrBuffer)) << 4;
         ptrBuffer ++;
+
 #else
 
     for (SampleVector::const_iterator it = begin; it != end; ++it /* ++it **/)
@@ -485,6 +486,10 @@ void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
                     {
                         m_fltAmpDelta=1.0f;
                     }
+
+                    //Reset extrema
+                    m_fltEffMin=2000000.0f;
+                    m_fltEffMax=-2000000.0f;
                 }
             }
             else
@@ -525,10 +530,10 @@ void ATVDemod::stop()
 
 bool ATVDemod::handleMessage(const Message& cmd)
 {
-	qDebug() << "ATVDemod::handleMessage";
+    qDebug() << "ATVDemod::handleMessage";
 
     if (DownChannelizer::MsgChannelizerNotification::match(cmd))
-	{
+    {
         DownChannelizer::MsgChannelizerNotification& objNotif = (DownChannelizer::MsgChannelizerNotification&) cmd;
 
         if(m_objRunning.m_intMsps!=objNotif.getSampleRate())
@@ -540,10 +545,10 @@ bool ATVDemod::handleMessage(const Message& cmd)
         qDebug() << "ATVDemod::handleMessage: MsgChannelizerNotification:"
                 << " m_intMsps: " << m_objRunning.m_intMsps;
 
-		return true;
-	}
-	else if (MsgConfigureATVDemod::match(cmd))
-	{
+        return true;
+    }
+    else if (MsgConfigureATVDemod::match(cmd))
+    {
         MsgConfigureATVDemod& objCfg = (MsgConfigureATVDemod&) cmd;
 
         if((objCfg.m_objMsgConfig.m_enmModulation != m_objRunning.m_enmModulation)
@@ -569,12 +574,12 @@ bool ATVDemod::handleMessage(const Message& cmd)
             ApplySettings();
          }
 
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 void ATVDemod::ApplySettings()
@@ -593,3 +598,4 @@ int ATVDemod::GetSampleRate()
 {
     return m_objRunning.m_intMsps;
 }
+
diff --git a/plugins/channelrx/demodatv/atvdemodplugin.cpp b/plugins/channelrx/demodatv/atvdemodplugin.cpp
index ba412e77c..18398202b 100644
--- a/plugins/channelrx/demodatv/atvdemodplugin.cpp
+++ b/plugins/channelrx/demodatv/atvdemodplugin.cpp
@@ -26,7 +26,7 @@
 const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor =
 {
 	QString("ATV Demodulator"),
-    QString("3.2.0"),
+    QString("3.3.0"),
     QString("(c) F4HKW for F4EXB / SDRAngel"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,