Ticket #2649: opengl_osd_fixes.diff

libs/libmythtv/openglvideo.cpp

@@ -145 +145 @@
         {
             inputTextures.push_back(yuv12tex);
             inputTextures.push_back(alphatex);
+            AddFilter(kGLFilterResize);
         }
     }
     else
@@ -804 +805 @@
         OpenGLFilterType type = it->first;
         OpenGLFilter *filter = it->second;
 
+        // skip colour conversion for osd already in frame buffer
+        if (!inputUpdated && type == kGLFilterYUV2RGBA)
+        {
+            inputs = filter->frameBufferTextures;
+            inputsize = videoSize;
+            continue;
+        }
+
         // skip colour conversion for frames already in frame buffer
         if (!inputUpdated && (frame == currentFrameNum) &&
             (type == kGLFilterYUV2RGB) && (frame != 0) &&
@@ -968 +977 @@
         }
 
         // enable blending for osd
-        if (type == kGLFilterYUV2RGBA)
+        if (type == kGLFilterResize && filters.count(kGLFilterYUV2RGBA))
             glEnable(GL_BLEND);
 
         // draw quad
@@ -980 +989 @@
         glEnd();
 
         // disable blending
-        if (type == kGLFilterYUV2RGBA)
+        if (type == kGLFilterResize && filters.count(kGLFilterYUV2RGBA))
             glDisable(GL_BLEND);
 
         // disable fragment program

libs/libmythtv/videoout_xv.cpp

@@ -284 +284 @@
                 gl_videochain->GetViewPort());
         }
 
+        if (gl_osdchain && gl_osdchain != NULL) 
+        {
+            gl_osdchain->SetMasterViewport(gl_videochain->GetViewPort());
+        }
+
         ok = CreateBuffers(VideoOutputSubType());
     }
 
@@ -1252 +1257 @@
             gl_osdchain = NULL;
             gl_use_osd_opengl2 = false;
         }
+        else 
+        {
+            if (gl_videochain && gl_videochain != NULL)
+            {
+                gl_osdchain->SetMasterViewport(gl_videochain->GetViewPort());
+            }
+        }
 
         gl_context->MakeCurrent(false);
     }