Ticket #4704: preview_pixelaspect.diff

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -32 +32 @@
 #include "oldsettings.h"
 #include "NuppelVideoPlayer.h"
 
+#include "util.h"
+#include "util-x11.h"
 #include "exitcodes.h"
 #include "mythcontext.h"
 #include "mythdbcon.h"
@@ -4625 +4627 @@
 
     float boundsaspect  = 4.0f / 3.0f;
     float imageaspect   = 4.0f / 3.0f;
+    float pixelaspect   = MythGetPixelAspectRatio();
+
+    if (GetNumberOfXineramaScreens() > 1)
+    {
+        pixelaspect = gContext->GetFloatSettingOnHost(
+            "XineramaMonitorAspectRatio", gContext->GetHostName(), 1.0f);
+    }
+
     QSize previewSize   = bounds;
 
     if ((bounds.width() > 0) && (bounds.height() > 0))
@@ -4633 +4643 @@
     if ((imageSize.width() > 0) && (imageSize.height() > 0))
         imageaspect = ((float)imageSize.width()) / ((float)imageSize.height());
 
+    if ((int)((boundsaspect + 0.05f) * 10) < (int)((pixelaspect  + 0.05f) * 10))
+        boundsaspect = boundsaspect * pixelaspect;
+
     // Calculate new height or width according to relative aspect ratio
     if ((int)((boundsaspect + 0.05f) * 10) >
         (int)((imageaspect  + 0.05f) * 10))