Ticket #4567: 4567-v2.patch

libs/libmythtv/avformatdecoder.cpp

@@ -1157 +1157 @@
             aspect_ratio = 4.0 / 3;
         }
 
-        GetNVP()->SetVideoParams(align_width, align_height, fps,
+        GetNVP()->SetVideoParams(enc->width, enc->height, fps,
                                  keyframedist, aspect_ratio, kScan_Detect, 
                                  dvd_video_codec_changed);
     }
@@ -2340 +2340 @@
                 uint awidth = width, aheight = height;
                 align_dimensions(context, awidth, aheight);
 
-                GetNVP()->SetVideoParams(awidth, aheight, seqFPS,
+                GetNVP()->SetVideoParams(width, height, seqFPS,
                                          keyframedist, aspect, 
                                          kScan_Detect);
                 
@@ -2420 +2420 @@
             uint awidth = width, aheight = height;
             align_dimensions(context, awidth, aheight);
 
-            GetNVP()->SetVideoParams(awidth, aheight, seqFPS,
+            GetNVP()->SetVideoParams(width, height, seqFPS,
                                      keyframedist, aspect_ratio,
                                      kScan_Detect);
 

libs/libmythtv/videooutbase.cpp

@@ -47 +47 @@
 #define LOC_ERR QString("VideoOutput, Error: ")
 
 static QSize fix_1080i(QSize raw);
+static QSize fix_alignment(QSize raw);
 static float fix_aspect(float raw);
 static QString to_comma_list(const QStringList &list);
 
@@ -375 +376 @@
     }
 
     display_visible_rect = QRect(0, 0, winw, winh);
-    video_dim            = QSize(width, height);
-    video_rect           = QRect(QPoint(winx, winy), fix_1080i(video_dim));
+    video_disp_dim       = fix_1080i(QSize(width, height));
+    video_dim            = fix_alignment(QSize(width, height));
+    video_rect           = QRect(QPoint(winx, winy), video_disp_dim);
 
     db_vdisp_profile->SetInput(video_dim);
 
@@ -603 +605 @@
     (void)myth_codec_id;
     (void)codec_private;
 
-    video_dim = input_size;
+    video_disp_dim = fix_1080i(input_size);
+    video_dim      = fix_alignment(input_size);
 
     db_vdisp_profile->SetInput(video_dim);
 
@@ -710 +713 @@
 QRect VideoOutput::GetVisibleOSDBounds(
     float &visible_aspect, float &font_scaling, float themeaspect) const
 {
-    float dv_w = ((float)video_dim.width())  / display_video_rect.width();
-    float dv_h = ((float)video_dim.height()) / display_video_rect.height();
+    float dv_w = (((float)video_disp_dim.width())  /
+                  display_video_rect.width());
+    float dv_h = (((float)video_disp_dim.height()) /
+                  display_video_rect.height());
 
     uint right_overflow = max((display_video_rect.width()
                                 + display_video_rect.left())
@@ -723 +728 @@
     // top left and bottom right corners respecting letterboxing
     QPoint tl = QPoint((uint) ceil(max(-display_video_rect.left(),0)*dv_w),
                        (uint) ceil(max(-display_video_rect.top(),0)*dv_h));
-    QPoint br = QPoint((uint) floor(video_dim.width()-(right_overflow*dv_w)),
-                       (uint) floor(video_dim.height()-(lower_overflow*dv_h)));
+    QPoint br = QPoint(
+        (uint) floor(video_disp_dim.width()  - (right_overflow * dv_w)),
+        (uint) floor(video_disp_dim.height() - (lower_overflow * dv_h)));
     // adjust for overscan
     if ((db_scale_vert > 0.0f) || (db_scale_horiz > 0.0f))
     {
@@ -762 +768 @@
  */
 QRect VideoOutput::GetTotalOSDBounds(void) const
 {
-    return QRect(QPoint(0, 0), video_dim);
+    return QRect(QPoint(0, 0), video_disp_dim);
 }
 
 /** \fn VideoOutput::ApplyManualScaleAndMove(void)
@@ -869 +875 @@
     if (db_scale_horiz > 0) 
     {
         float tmp = 1.0f - 2.0f * db_scale_horiz;
-        video_rect.moveLeft((int) round(video_dim.width() * db_scale_horiz));
-        video_rect.setWidth((int) round(video_dim.width() * tmp));
+        video_rect.moveLeft(
+            (int) round(video_disp_dim.width() * db_scale_horiz));
+        video_rect.setWidth((int) round(video_disp_dim.width() * tmp));
 
         int xoff = db_move.x();
         if (xoff > 0) 
@@ -1102 +1109 @@
 void VideoOutput::MoveResize(void)
 {
     // Preset all image placement and sizing variables.
-    video_rect         = QRect(QPoint(0, 0), fix_1080i(video_dim));
+    video_rect         = QRect(QPoint(0, 0), video_disp_dim);
     display_video_rect = display_visible_rect;
 
     // Avoid too small frames for audio only streams (for OSD).
     if ((video_rect.width() <= 0) || (video_rect.height() <= 0))
     {
-        video_dim  = display_visible_rect.size();
-        video_rect = QRect(QPoint(0, 0), video_dim);
+        video_disp_dim = display_visible_rect.size();
+        video_dim      = fix_alignment(display_visible_rect.size());
+        video_rect     = QRect(QPoint(0, 0), video_dim);
     }
 
     // Apply various modifications
@@ -1445 +1453 @@
     }
 
     // adjust for non-square pixels on screen
-    float dispPixelAdj = (GetDisplayAspect() * video_dim.height()) /
-        video_dim.width();
+    float dispPixelAdj =
+        (GetDisplayAspect() * video_disp_dim.height())/video_disp_dim.width();
 
     // adjust for non-square pixels in video
     float vidPixelAdj  = pipVideoWidth / (pipVideoAspect * pipVideoHeight);
@@ -1826 +1834 @@
     return raw;
 }
 
+/// Correct for underalignment
+static QSize fix_alignment(QSize raw)
+{
+    return QSize((raw.width()  + 15) & (~0xf),
+                 (raw.height() + 15) & (~0xf));
+}
+
 /// Correct for rounding errors
 static float fix_aspect(float raw)
 {

libs/libmythtv/videoout_xv.cpp

@@ -235 +235 @@
     QMutexLocker locker(&global_lock);
 
     bool cid_changed = (myth_codec_id != av_codec_id);
-    bool res_changed = input_size != video_dim;
+    bool res_changed = input_size != video_disp_dim;
     bool asp_changed = aspect != video_aspect;
 
     VideoOutput::InputChanged(input_size, aspect, av_codec_id, codec_private);
@@ -318 +318 @@
     QSize dvr2 = QSize(display_visible_rect.width()  & ~0x3,
                        display_visible_rect.height() & ~0x1);
 
-    QSize sz = (chroma_osd || gl_use_osd_opengl2) ? dvr2 : video_dim;
+    QSize sz = (chroma_osd || gl_use_osd_opengl2) ? dvr2 : video_disp_dim;
     return QRect(QPoint(0,0), sz);
 }
 
@@ -379 +379 @@
 
 void VideoOutputXv::ResizeForVideo(void) 
 {
-    ResizeForVideo(video_dim.width(), video_dim.height());
+    ResizeForVideo(video_disp_dim.width(), video_disp_dim.height());
 }
 
 void VideoOutputXv::ResizeForGui(void)
@@ -4073 +4073 @@
     QRect position;
     float pipVideoAspect = 1.3333f;
     // set height
-    int tmph = (video_dim.height() * db_pip_size) / 100;
+    int tmph = (video_disp_dim.height() * db_pip_size) / 100;
     // adjust for aspect override modes...
     int letterXadj = 0;
     int letterYadj = 0;
@@ -4106 +4106 @@
             break;
         case kPIPBottomLeft:
             xoff += letterXadj;
-            yoff = video_dim.height() - position.height() - 
+            yoff = video_disp_dim.height() - position.height() - 
                 yoff - letterYadj;
             break;
         case kPIPTopRight:
-            xoff = video_dim.width() - position.width() -
+            xoff = video_disp_dim.width() - position.width() -
                     xoff - letterXadj;
             yoff = yoff + letterYadj;
             break;
         case kPIPBottomRight:
-            xoff = video_dim.width() - position.width() -
+            xoff = video_disp_dim.width() - position.width() -
                     xoff - letterXadj;
-            yoff = video_dim.height() - position.height() -
+            yoff = video_disp_dim.height() - position.height() -
                    yoff - letterYadj;
             break;
     }

libs/libmythtv/videooutbase.h

@@ -273 +273 @@
     float   display_aspect;   ///< Physical aspect ratio of playback window
 
     // Video dimensions
-    QSize   video_dim;        ///< Pixel dimensions of video
+    QSize   video_dim;        ///< Pixel dimensions of video buffer
+    QSize   video_disp_dim;   ///< Pixel dimensions of video display area
     float   video_aspect;     ///< Physical aspect ratio of video
 
     /// Normally this is the same as videoAspect, but may not be