Ticket #3044: glfixes.diff

libs/libmythtv/openglvideo.h

@@ -17 +17 @@
     // Conversion filters
     kGLFilterYUV2RGB,
     kGLFilterYUV2RGBA,
-    kGLFilterResize,
 
     // Frame rate preserving deinterlacers
     kGLFilterLinearBlendDeint,
@@ -29 +28 @@
     kGLFilterLinearBlendDeintDFR,
     kGLFilterKernelDeintDFR,
     kGLFilterOneFieldDeintDFR,
+
+    // Scaling filters
+    kGLFilterResize
 };
 
 enum DisplayBuffer

libs/libmythtv/openglvideo.cpp

@@ -593 +593 @@
     if (gl_context->IsRectTextureSupported())
         return size;
 
-    glOrtho(0, size.width(), 0, size.height(), 1, -1);
-    // aargh...
-
     int w = 64;
     int h = 64;
 
@@ -753 +750 @@
     {
         it->second->outputBuffer = kFrameBufferObject;
 
-        if ((it->first >= kGLFilterKernelDeint) &&
+        if ((it->first >= kGLFilterLinearBlendDeint) &&
             (it->first <= kGLFilterOneFieldDeintDFR) &&
             !deinterlacing)
         {
@@ -807 +804 @@
         // skip colour conversion for frames already in frame buffer
         if (!inputUpdated && (frame == currentFrameNum) &&
             (type == kGLFilterYUV2RGB) && (frame != 0) &&
-            (!softwareDeinterlacing || (softwareDeinterlacer != "bobdeint")))
+            (!(softwareDeinterlacing && softwareDeinterlacer == "bobdeint")))
         {
             inputs = filter->frameBufferTextures;
             inputsize = videoSize;

libs/libmythtv/videoout_xv.cpp

@@ -146 +146 @@
     // to a singleton instance of the DisplayRes class
     if (gContext->GetNumSetting("UseVideoModes", 0))
         display_res = DisplayRes::GetDisplayRes();
+    use_colorcontrols = gContext->
+                         GetNumSetting("UseOutputPictureControls", 0);
 }
 
 VideoOutputXv::~VideoOutputXv()
@@ -266 +268 @@
                     gl_pipchain->SetMasterViewport(
                         gl_videochain->GetViewPort());
                 }
+                if (gl_osdchain && gl_osdchain != NULL)
+                {
+                    gl_osdchain->SetMasterViewport(
+                        gl_videochain->GetViewPort());
+                }
+
             }
         }
 #endif // USING_OPENGL_VIDEO
@@ -851 +859 @@
                 gl_osdchain = NULL;
                 gl_osd = false;
             }
+            else
+            {
+            if (gl_videochain && gl_videochain != NULL)
+                {
+                    gl_osdchain->SetMasterViewport(
+                        gl_videochain->GetViewPort());
+                }
+            }
 
             gl_context->MakeCurrent(false);
 #endif // USING_OPENGL_VIDEO
@@ -1445 +1461 @@
     // The XVideo output methods sometimes allow the picture to
     // be adjusted, if the chroma keying color can be discovered.
     if (((VideoOutputSubType() >= XVideo && xv_colorkey) ||
-         (VideoOutputSubType() == OpenGL)) &&
-        gContext->GetNumSetting("UseOutputPictureControls", 0))
+         (VideoOutputSubType() == OpenGL)) && use_colorcontrols)
         InitPictureAttributes();
 
     return true;