Ticket #5324: mythtv-vid-18a.diff

libs/libmythtv/openglvideo.cpp

@@ -275 +275 @@
         }
         else
         {
-            last_filter = false;
             it->second->outputBuffer = kDefaultBuffer;
+            last_filter = false;
         }
 
         buffers_needed = it->second->numInputs;
@@ -543 +543 @@
 }
 
 // locking ok
-void OpenGLVideo::UpdateInputFrame(const VideoFrame *frame)
+void OpenGLVideo::UpdateInputFrame(const VideoFrame *frame, bool soft_bob)
 {
     OpenGLContextLocker ctx_lock(gl_context);
 
@@ -560 +560 @@
     {
         gl_context->UpdateTexture(inputTextures[0], frame->buf,
                                   frame->offsets, frame->pitches, FMT_YV12,
-                                  frame->interlaced_frame);
+                                  frame->interlaced_frame && !soft_bob);
         inputUpdated = true;
         return;
     }

libs/libmythtv/openglvideo.h

@@ -61 +61 @@
               bool viewport_control, bool osd = FALSE,
               LetterBoxColour letterbox_colour = kLetterBoxColour_Black);
 
-    void UpdateInputFrame(const VideoFrame *frame);
+    void UpdateInputFrame(const VideoFrame *frame, bool soft_bob = FALSE);
     void UpdateInput(const unsigned char *buf, const int *offsets,
                      int format, QSize size,
                      const unsigned char *alpha);

libs/libmythtv/videoout_xv.cpp

@@ -3796 +3796 @@
             DisplayOSD(frame, osd);
     }
 
+    bool soft_bob = m_deinterlacing && (m_deintfiltername == "bobdeint");
+
     if (gl_videochain)
-        gl_videochain->UpdateInputFrame(frame);
+        gl_videochain->UpdateInputFrame(frame, soft_bob);
 }
 
 void VideoOutputXv::ProcessFrameMem(VideoFrame *frame, OSD *osd,