pvrvideosink: fix unwanted scaling on cropped videos

When a video with crop rectangle was used, the window was created with
the uncropped size, and kept that way after the crop event was received,
leading to a slight scaling of the video (and likely slight aspect ratio
change as well).

This is fixed by resizing the window to the cropped size when it changes.

diff --git a/sys/pvr2d/gstpvrvideosink.c b/sys/pvr2d/gstpvrvideosink.c
index 54ef681910b3570bc3ee69b4d23611b62a566c0f..3e7b7aa9c7361805cc14fbf53df8f981905a706e 100644 (file)
--- a/sys/pvr2d/gstpvrvideosink.c
+++ b/sys/pvr2d/gstpvrvideosink.c
@@ -1115,6 +1115,15 @@ gst_pvrvideosink_xwindow_draw_borders (GstPVRVideoSink * pvrvideosink,
 
 /* Element stuff */
 
+static void
+gst_pvrvideosink_resize_window (GstPVRVideoSink * pvrvideosink, gint width,
+    gint height)
+{
+  XResizeWindow (pvrvideosink->dcontext->x_display,
+      pvrvideosink->xwindow->window, width, height);
+  gst_pvrvideosink_xwindow_update_geometry (pvrvideosink);
+}
+
 static gboolean
 gst_pvrvideosink_configure_overlay (GstPVRVideoSink * pvrvideosink, gint width,
     gint height, gint video_par_n, gint video_par_d, gint display_par_n,
@@ -1122,6 +1131,8 @@ gst_pvrvideosink_configure_overlay (GstPVRVideoSink * pvrvideosink, gint width,
 {
   guint calculated_par_n;
   guint calculated_par_d;
+  gint old_sink_width = GST_VIDEO_SINK_WIDTH (pvrvideosink);
+  gint old_sink_height = GST_VIDEO_SINK_HEIGHT (pvrvideosink);
 
   if (!gst_video_calculate_display_ratio (&calculated_par_n, &calculated_par_d,
           width, height, video_par_n, video_par_d, display_par_n,
@@ -1161,6 +1172,19 @@ gst_pvrvideosink_configure_overlay (GstPVRVideoSink * pvrvideosink, gint width,
       GST_VIDEO_SINK_WIDTH (pvrvideosink),
       GST_VIDEO_SINK_HEIGHT (pvrvideosink));
 
+  if (old_sink_width != GST_VIDEO_SINK_WIDTH (pvrvideosink)
+      || old_sink_height != GST_VIDEO_SINK_HEIGHT (pvrvideosink)) {
+    g_mutex_lock (pvrvideosink->flow_lock);
+    if (pvrvideosink->xwindow) {
+      GST_DEBUG_OBJECT (pvrvideosink,
+          "Resizing window to match new overlay size");
+      gst_pvrvideosink_resize_window (pvrvideosink,
+          GST_VIDEO_SINK_WIDTH (pvrvideosink),
+          GST_VIDEO_SINK_HEIGHT (pvrvideosink));
+    }
+    g_mutex_unlock (pvrvideosink->flow_lock);
+  }
+
   return TRUE;
 }