Ticket #2131: myth-zoom.patch

libs/libmythtv/videoout_quartz.cpp

@@ -347 +347 @@
     {
         case kLetterbox_4_3_Zoom:
             // height only fills 3/4 of image, zoom up
+            // (9/16)*4 is 2.25, using 2.25 of 3
             hscale = vscale = h * 1.0 / (sh * 0.75);
             break;
+        case kLetterbox_14_9_Zoom:
+            // height only fills part of image, zoom up
+            // (9/14)*4 is about 2.57, using 2.57 of 3
+            hscale = vscale = w * 7.0 / (sw * 6);
+            break;
         case kLetterbox_16_9_Zoom:
             // width only fills 3/4 of image, zoom up
             hscale = vscale = w * 1.0 / (sw * 0.75);

libs/libmythtv/tv_play.cpp

@@ -5068 +5068 @@
         case kLetterbox_4_3:          text = tr("4:3"); break;
         case kLetterbox_16_9:         text = tr("16:9"); break;
         case kLetterbox_4_3_Zoom:     text = tr("4:3 Zoom"); break;
+        case kLetterbox_14_9_Zoom:    text = tr("14:9 Zoom"); break;
         case kLetterbox_16_9_Zoom:    text = tr("16:9 Zoom"); break;
         case kLetterbox_16_9_Stretch: text = tr("16:9 Stretch"); break;
         case kLetterbox_Fill:         text = tr("Fill"); break;

libs/libmythtv/videooutbase.cpp

@@ -387 +387 @@
     {
         letterboxed_video_aspect = 4.0f / 3.0f;
     }
+    else if ((kLetterbox_14_9_Zoom == letterbox))
+    {
+        letterboxed_video_aspect = 4.0f / 3.0f;
+    }
     else if ((kLetterbox_16_9      == letterbox) ||
              (kLetterbox_16_9_Zoom == letterbox))
     {
@@ -778 +782 @@
             display_video_rect.width()  * 4 / 3,
             display_video_rect.height() * 4 / 3);
     }
+    else if (letterbox == kLetterbox_14_9_Zoom)
+    {
+        // Zoom mode -- Expand by 7/6 and overscan.
+        // Intended to be used to eliminate the top bars
+        // on 14:9 material.
+        // Expanding by 7/6, so remove 1/6 of original from overscan;
+        // take half from each side, so remove 1/12.
+        display_video_rect = QRect(
+            display_video_rect.left() - (display_video_rect.width()  / 12),
+            display_video_rect.top()  - (display_video_rect.height() / 12),
+            display_video_rect.width()  * 7 / 6,
+            display_video_rect.height() * 7 / 6);
+    }
+
     else if (letterbox == kLetterbox_16_9_Stretch)
     {
         // Stretch mode -- intended to be used to eliminate side

libs/libmythtv/videooutbase.h

@@ -93 +93 @@
 {
     kLetterbox_Toggle = -1,
     kLetterbox_Off = 0,
+    kLetterbox_14_9_Zoom,
     kLetterbox_4_3,
     kLetterbox_16_9,
     kLetterbox_4_3_Zoom,