Ticket #5324: mythtv-vid-26.diff

libs/libmythtv/openglvideo.cpp

@@ -44 +44 @@
     inputTextureSize(0,0),    currentFrameNum(0),
     inputUpdated(false),      
     textureRects(false),      textureType(GL_TEXTURE_2D),
-    helperTexture(0),         defaultResize(kGLFilterResize),
+    helperTexture(0),         defaultUpsize(kGLFilterResize),
     convertSize(0,0),         convertBuf(NULL),
     videoResize(false),       videoResizeRect(0,0,0,0),
     gl_features(0),
@@ -122 +122 @@
         gl_context->SetFeatures(gl_features);
 
     if (options.contains("openglbicubic"))
-        defaultResize = kGLFilterBicubic;
+        defaultUpsize = kGLFilterBicubic;
 
-    if ((defaultResize != kGLFilterBicubic) && (gl_features & kGLExtRect))
+    if ((defaultUpsize != kGLFilterBicubic) && (gl_features & kGLExtRect))
         gl_context->GetTextureType(textureType, textureRects);
 
     SetViewPort(display_visible_rect.size());
@@ -196 +196 @@
     bool mmx = false;
 #endif
 
+    CheckResize(false);
+
     VERBOSE(VB_PLAYBACK, LOC + 
             QString("Using packed textures with%1 mmx and with%2 PBOs")
             .arg(mmx ? "" : "out").arg(use_pbo ? "" : "out"));
@@ -203 +205 @@
     return true;
 }
 
-bool OpenGLVideo::OptimiseFilters(void)
+void OpenGLVideo::CheckResize(bool deinterlacing)
 {
-    bool resize =  ((video_dim.height() < display_video_rect.height()) ||
-                    (video_dim.width()  <  display_video_rect.width()));
-    resize &= !filters.count(kGLFilterResize);
-    resize &= !filters.count(kGLFilterBicubic);
+    // to improve performance on slower cards
+    bool resize_up = (video_dim.height() < display_video_rect.height()) ||
+                     (video_dim.width()  < display_video_rect.width());
+
+    // to ensure deinterlacing works correctly
+    bool resize_down = (video_dim.height() > display_video_rect.height()) &&
+                        deinterlacing;
+
+    if (resize_up && (defaultUpsize == kGLFilterBicubic))
+    {
+        RemoveFilter(kGLFilterResize);
+        filters.erase(kGLFilterResize);
+        AddFilter(kGLFilterBicubic);
+        return;
+    }
+
+    if ((resize_up && (defaultUpsize == kGLFilterResize)) || resize_down)
+    {
+        RemoveFilter(kGLFilterBicubic);
+        filters.erase(kGLFilterBicubic);
+        AddFilter(kGLFilterResize);
+        return;
+    }
+
+    if (!filters.count(kGLFilterYUV2RGBA))
+    {
+        RemoveFilter(kGLFilterResize);
+        filters.erase(kGLFilterResize);
+    }
+
+    RemoveFilter(kGLFilterBicubic);
+    filters.erase(kGLFilterBicubic);
 
-    if (resize)
-        AddFilter(defaultResize);
+    OptimiseFilters();
+}
 
+bool OpenGLVideo::OptimiseFilters(void)
+{
     glfilt_map_t::reverse_iterator it;
 
     // add/remove required frame buffer objects
@@ -464 +496 @@
 
     if (success)
     {
+        CheckResize(hardwareDeinterlacing);
         hardwareDeinterlacer = deinterlacer;
         return true;
     }
@@ -727 +760 @@
         return;
 
     hardwareDeinterlacing = deinterlacing;
+
+    OpenGLContextLocker ctx_lock(gl_context);
+    CheckResize(hardwareDeinterlacing);
 }
 
 // locking ok

libs/libmythtv/openglvideo.h

@@ -82 +82 @@
     void SetViewPort(const QSize &new_viewport_size);
     bool AddFilter(OpenGLFilterType filter);
     bool RemoveFilter(OpenGLFilterType filter);
+    void CheckResize(bool deinterlacing);
     bool OptimiseFilters(void);
     bool AddFrameBuffer(uint &framebuffer, QSize fb_size,
                         uint &texture, QSize vid_size);
@@ -130 +131 @@
     bool           textureRects;
     uint           textureType;
     uint           helperTexture;
-    OpenGLFilterType defaultResize;
+    OpenGLFilterType defaultUpsize;
 
     QSize          convertSize;
     unsigned char *convertBuf;