[xine-cvs] HG: xine-lib-1.2: Fix subtle video scaling bug when "square monitor pixels" is set.

[Torsten J. <t....@gm...>]

# HG changeset patch
# User Torsten Jager <t....@gm...>
# Date 1450703560 -3600
# Node ID 93902f8f0badb7b81a5f72bd0bd095f3b959f661
# Branch  default
# Parent  2517ffeb53b060262fed62f78c94c0338dd59844
Fix subtle video scaling bug when "square monitor pixels" is set.

diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2014 the xine project
+ * Copyright (C) 2000-2015 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -46,13 +46,12 @@
 
 void _x_vo_scale_compute_ideal_size (vo_scale_t *this) {
 
-  double image_ratio, desired_ratio;
-
   if (this->scaling_disabled & ~1) {
 
-    this->video_pixel_aspect = this->gui_pixel_aspect;
+    this->video_pixel_aspect = (this->scaling_disabled & 1) ? 1.0 : this->gui_pixel_aspect;
 
   } else {
+    double image_ratio, desired_ratio;
 
     /*
      * aspect ratio
@@ -83,9 +82,13 @@
 
     _x_assert(this->gui_pixel_aspect != 0.0);
 
-    if (fabs (this->video_pixel_aspect / this->gui_pixel_aspect - 1.0)
-	< 0.01) {
-      this->video_pixel_aspect = this->gui_pixel_aspect;
+    /* dont scale just for tiny pixel aspect shift */
+    if (this->scaling_disabled & 1) {
+      if (fabs (this->video_pixel_aspect - 1.0) < 0.01)
+        this->video_pixel_aspect = 1.0;
+    } else {
+      if (fabs (this->video_pixel_aspect / this->gui_pixel_aspect - 1.0) < 0.01)
+        this->video_pixel_aspect = this->gui_pixel_aspect;
     }
 
 #if 0