Changeset 49439 in webkit

Timestamp:

Oct 12, 2009 7:34:39 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-12 Sebastian Dröge <​sebastian.droege@collabora.co.uk>

Reviewed by Gustavo Noronha.

​https://bugs.webkit.org/show_bug.cgi?id=29998

Scale video to completely fill the target surface while
keeping the aspect ratio. This fixes displaying of the
YouTube HTML5 sample website.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: Scale video to completely fill the target surface, keep the aspect ratio and center it.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-12  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+        Reviewed by Gustavo Noronha.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29998
+        
+        Scale video to completely fill the target surface while
+        keeping the aspect ratio. This fixes displaying of the
+        YouTube HTML5 sample website.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        Scale video to completely fill the target surface, keep
+        the aspect ratio and center it.
+
 2009-10-12  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp

@@ -657 +657 @@
     double doublePixelAspectRatioNumerator = 0;
     double doublePixelAspectRatioDenominator = 0;
+    double displayWidth;
+    double displayHeight;
+    double scale, gapHeight, gapWidth;
+
     GstCaps *caps = gst_buffer_get_caps(m_buffer);
 
@@ -665 +669 @@
     }
 
+    displayWidth = width;
+    displayHeight = height;
     doublePixelAspectRatioNumerator = pixelAspectRatioNumerator;
     doublePixelAspectRatioDenominator = pixelAspectRatioDenominator;
@@ -677 +683 @@
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
 
+    displayWidth *= doublePixelAspectRatioNumerator / doublePixelAspectRatioDenominator;
+    displayHeight *= doublePixelAspectRatioDenominator / doublePixelAspectRatioNumerator;
+
+    scale = MIN (rect.width () / displayWidth, rect.height () / displayHeight);
+    displayWidth *= scale;
+    displayHeight *= scale;
+
+    // Calculate gap between border an picture
+    gapWidth = (rect.width() - displayWidth) / 2.0;
+    gapHeight = (rect.height() - displayHeight) / 2.0;
+
     // paint the rectangle on the context and draw the surface inside.
-    cairo_translate(cr, rect.x(), rect.y());
+    cairo_translate(cr, rect.x() + gapWidth, rect.y() + gapHeight);
     cairo_rectangle(cr, 0, 0, rect.width(), rect.height());
     cairo_scale(cr, doublePixelAspectRatioNumerator / doublePixelAspectRatioDenominator,
                 doublePixelAspectRatioDenominator / doublePixelAspectRatioNumerator);
+    cairo_scale(cr, scale, scale);
     cairo_set_source_surface(cr, src, 0, 0);
     cairo_fill(cr);