Ticket #5324: openglvid_7.diff

libs/libmythtv/openglvideo.cpp

@@ -36 +36 @@
 
 OpenGLVideo::OpenGLVideo() :
     gl_context(NULL),         video_dim(0,0),
-    viewportSize(0,0),        masterViewportSize(0,0),
-    display_visible_rect(0,0,0,0),     display_video_rect(0,0,0,0),
-    video_rect(0,0,0,0),       frameBufferRect(0,0,0,0),
-    softwareDeinterlacer(QString::null),
+    actual_video_dim(0,0),    viewportSize(0,0),
+    masterViewportSize(0,0),  display_visible_rect(0,0,0,0),
+    display_video_rect(0,0,0,0), video_rect(0,0,0,0),
+    frameBufferRect(0,0,0,0), softwareDeinterlacer(QString::null),
     hardwareDeinterlacing(false),
     useColourControl(false),  viewportControl(false),
     inputTextureSize(0,0),    currentFrameNum(0),
@@ -94 +94 @@
                        bool viewport_control, bool osd)
 {
     gl_context            = glcontext;
+    actual_video_dim      = videoDim;
     video_dim             = videoDim;
+    if (video_dim.height() == 1088)
+        video_dim.setHeight(1080);
     display_visible_rect  = displayVisibleRect;
     display_video_rect    = displayVideoRect;
     video_rect            = videoRect;
@@ -140 +143 @@
     }
     else
     {
-        QSize half_size(video_dim.width() >> 1, video_dim.height() >>1);
+        QSize half_size(actual_video_dim.width() >> 1,
+                        actual_video_dim.height() >>1);
         GLuint utex = CreateVideoTexture(half_size, inputTextureSize);
         GLuint vtex = CreateVideoTexture(half_size, inputTextureSize);
-        GLuint ytex = CreateVideoTexture(video_dim, inputTextureSize);;
+        GLuint ytex = CreateVideoTexture(actual_video_dim, inputTextureSize);;
 
         if ((ytex && utex && vtex) && AddFilter(kGLFilterYUV2RGB))
         {
@@ -166 +170 @@
                 "Falling back to software conversion.\n\t\t\t"
                 "Any opengl filters will also be disabled.");
 
-        GLuint rgb24tex = CreateVideoTexture(video_dim, inputTextureSize);
+        GLuint rgb24tex = CreateVideoTexture(actual_video_dim,
+                                             inputTextureSize);
 
         if (rgb24tex && AddFilter(kGLFilterResize))
         {
@@ -547 +552 @@
 // locking ok
 void OpenGLVideo::UpdateInputFrame(const VideoFrame *frame)
 {
-    if (frame->width  != video_dim.width()  ||
-        frame->height != video_dim.height() ||
+    if (frame->width  != actual_video_dim.width()  ||
+        frame->height != actual_video_dim.height() ||
         frame->width  < 1 ||
         frame->height < 1)
     {
@@ -558 +563 @@
 
     if (filters.count(kGLFilterYUV2RGB) && (frame->codec == FMT_YV12))
     {
-        UpdateInput(frame->buf, frame->offsets, 0, FMT_YV12, video_dim);
+        UpdateInput(frame->buf, frame->offsets, 0, FMT_YV12, actual_video_dim);
         return;
     }
 
     // software yuv2rgb
-    if (convertSize != video_dim)
+    if (convertSize != actual_video_dim)
     {
         ShutDownYUV2RGB();
 
         VERBOSE(VB_PLAYBACK, LOC + "Init software conversion.");
 
-        convertSize = video_dim;
+        convertSize = actual_video_dim;
         convertBuf = new unsigned char[
-            (video_dim.width() * video_dim.height() * 3) + 128];
+            (actual_video_dim.width() * actual_video_dim.height() * 3) + 128];
     }
 
     if (convertBuf)

libs/libmythtv/openglvideo.h

@@ -82 +82 @@
     QSize GetViewPort(void)         const { return viewportSize; }
     void  SetVideoRect(const QRect &dispvidrect, const QRect &vidrect)
         { display_video_rect = dispvidrect; video_rect = vidrect;}
-    QSize GetVideoSize(void)        const { return video_dim; }
+    QSize GetVideoSize(void)        const { return actual_video_dim; }
     void SetVideoResize(const QRect &rect);
     void DisableVideoResize(void);
     int SetPictureAttribute(PictureAttribute attributeType, int newValue);
@@ -112 +112 @@
 
     OpenGLContext *gl_context;
     QSize          video_dim;
+    QSize          actual_video_dim;
     QSize          viewportSize;
     QSize          masterViewportSize;
     QRect          display_visible_rect;