Ticket #3797: pillarbars.diff

libs/libmythtv/videooutbase.cpp

@@ -1121 +1121 @@
 
         letterAdj  = video_aspect / letterboxed_video_aspect;
     }
+    if (letterbox = kLetterbox_Gray_Pillarboxes)
+    {
+        letterXadj = max(-display_video_rect.left(), 0);
+        float xadj = (float) video_rect.width() / display_visible_rect.width();
+        letterXadj = (int) (letterXadj * xadj);
 
+        float yadj = (float)video_rect.height() /display_visible_rect.height();
+        letterYadj = max(-display_video_rect.top(), 0);
+        letterYadj = (int) (letterYadj * yadj);
+
+        letterAdj  = video_aspect / letterboxed_video_aspect;
+    }
+
     // adjust for non-square pixels on screen
     float dispPixelAdj = (GetDisplayAspect() * video_dim.height()) /
         video_dim.width();

libs/libmythtv/videoout_xv.h

@@ -186 +186 @@
     int                  XJ_screenwidth;
     int                  XJ_screenheight;
     bool                 XJ_started;
+    Colormap             cmap;
+    XColor               color, colorrgb;
 
     // Used for all non-XvMC drawing
     VideoFrame           av_pause_frame;

libs/libmythtv/videoout_xv.cpp

@@ -2559 +2559 @@
     needrepaint = false;
     xv_need_bobdeint_repaint = false;
 
-    // Draw black in masked areas
-    XSetForeground(XJ_disp, XJ_gc, XJ_black);
+    // Set the masked area to black unless Gray Pillarbars was selected
+    cmap = DefaultColormap (XJ_disp, XJ_screen_num);
+    db_letterbox       = gContext->GetNumSetting("AspectOverride",     0);
+    if (kLetterbox_Gray_Pillarboxes == db_letterbox)
+    {
+        XAllocNamedColor (XJ_disp, cmap, "gray20", &color, &colorrgb);
+    }
+    else 
+    {
+        XAllocNamedColor (XJ_disp, cmap, "gray0", &color, &colorrgb);
+    }
 
+    // Draw black or gray in masked areas
+    XSetForeground(XJ_disp, XJ_gc, color.pixel); 
+
     if (display_video_rect.left() > display_visible_rect.left())
     { // left
         XFillRectangle(XJ_disp, XJ_curwin, XJ_gc,

libs/libmythtv/videooutbase.h

@@ -99 +99 @@
     kLetterbox_16_9_Zoom,
     kLetterbox_16_9_Stretch,
     kLetterbox_Fill,
+    kLetterbox_Gray_Pillarboxes,
     kLetterbox_END
 };
 

programs/mythfrontend/globalsettings.cpp

@@ -1550 +1550 @@
     gc->addSelection(QObject::tr("16/9 Zoom"), "4");
     gc->addSelection(QObject::tr("16/9 Stretch"), "5");
     gc->addSelection(QObject::tr("Fill"), "6");
+    gc->addSelection(QObject::tr("Gray Pillarboxes"), "7");
     gc->setHelpText(QObject::tr("This will override any aspect ratio in the "
                     "recorded stream, the same as pressing the W Key during "
                     "playback. Fill will \"fill\" the screen with the image "