MythDeinterlacer: Reset libavfilter deinterlacers after discontinuity

- this brings them in line with the other GLSL and driver based, multi- frame deinterlacers
MythTV · Feb 14, 2020 · e3528a0 · e3528a0
1 parent d323d60
commit e3528a0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/mythtv/libs/libmythtv/mythdeinterlacer.cpp b/mythtv/libs/libmythtv/mythdeinterlacer.cpp
@@ -115,7 +115,19 @@ void MythDeinterlacer::Filter(VideoFrame *Frame, FrameScanType Scan, bool Force)
             Cleanup();
             return;
         }
+        Force = true;
     }
+    else if ((abs(Frame->frameCounter - m_discontinuityCounter) > 1) && (m_deintType != DEINT_BASIC))
+    {
+        if (!Initialise(Frame, deinterlacer, doublerate, topfieldfirst))
+        {
+            Cleanup();
+            return;
+        }
+        Force = true;
+    }
+
+    m_discontinuityCounter = Frame->frameCounter;
 
     // Set in use deinterlacer for debugging
     Frame->deinterlace_inuse = m_deintType | DEINT_CPU;
@@ -271,6 +283,7 @@ void MythDeinterlacer::Cleanup(void)
     avfilter_graph_free(&m_graph);
     sws_freeContext(m_swsContext);
     m_swsContext = nullptr;
+    m_discontinuityCounter = 0;
 
     if (m_bobFrame)
     {

diff --git a/mythtv/libs/libmythtv/mythdeinterlacer.h b/mythtv/libs/libmythtv/mythdeinterlacer.h
@@ -43,6 +43,7 @@ class MythDeinterlacer
     AVFilterContext* m_sink       { nullptr };
     VideoFrame*      m_bobFrame   { nullptr };
     SwsContext*      m_swsContext { nullptr };
+    long long        m_discontinuityCounter { 0 };
 };
 
 #endif // MYTHDEINTERLACER_H