Changeset 50736 in webkit

Timestamp:

Nov 10, 2009 3:34:48 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-10 Philippe Normand <​pnormand@igalia.com>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=31047
[GTK] Failing test media/video-played-ranges-1.html

WebKit coding style fixes.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::mediaPlayerPrivateMessageCallback): (WebCore::MediaPlayerPrivate::naturalSize): (WebCore::MediaPlayerPrivate::paint): (WebCore::mimeTypeCache):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-10  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31047
+        [GTK] Failing test media/video-played-ranges-1.html
+
+        WebKit coding style fixes.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mediaPlayerPrivateMessageCallback):
+        (WebCore::MediaPlayerPrivate::naturalSize):
+        (WebCore::MediaPlayerPrivate::paint):
+        (WebCore::mimeTypeCache):
+
 2009-11-10  Oliver Hunt  <oliver@apple.com>
 

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

@@ -67 +67 @@
 
         error = MediaPlayer::Empty;
-        if (err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND ||
-            err->code == GST_STREAM_ERROR_WRONG_TYPE ||
-            err->code == GST_STREAM_ERROR_FAILED ||
-            err->code == GST_CORE_ERROR_MISSING_PLUGIN ||
-            err->code == GST_RESOURCE_ERROR_NOT_FOUND)
+        if (err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND
+            || err->code == GST_STREAM_ERROR_WRONG_TYPE
+            || err->code == GST_STREAM_ERROR_FAILED
+            || err->code == GST_CORE_ERROR_MISSING_PLUGIN
+            || err->code == GST_RESOURCE_ERROR_NOT_FOUND)
             error = MediaPlayer::FormatError;
         else if (err->domain == GST_STREAM_ERROR)
@@ -336 +336 @@
         gint pixelAspectRatioNumerator, pixelAspectRatioDenominator;
 
-        if (!GST_IS_CAPS(caps) || !gst_caps_is_fixed(caps) ||
-            !gst_video_format_parse_caps(caps, NULL, &width, &height) ||
-            !gst_video_parse_caps_pixel_aspect_ratio(caps, &pixelAspectRatioNumerator,
-                                                           &pixelAspectRatioDenominator)) {
+        if (!GST_IS_CAPS(caps) || !gst_caps_is_fixed(caps)
+            || !gst_video_format_parse_caps(caps, 0, &width, &height)
+            || !gst_video_parse_caps_pixel_aspect_ratio(caps, &pixelAspectRatioNumerator,
+                                                        &pixelAspectRatioDenominator)) {
             gst_object_unref(GST_OBJECT(pad));
             return IntSize();
@@ -696 +696 @@
     GstVideoFormat format;
 
-    GstCaps *caps = gst_buffer_get_caps(m_buffer);
-
-    if (G_UNLIKELY(!gst_video_format_parse_caps(caps, &format, &width, &height) ||
-        !gst_video_parse_caps_pixel_aspect_ratio(caps, &pixelAspectRatioNumerator, &pixelAspectRatioDenominator))) {
+    GstCaps* caps = gst_buffer_get_caps(m_buffer);
+
+    if (G_UNLIKELY(!gst_video_format_parse_caps(caps, &format, &width, &height)
+                   || !gst_video_parse_caps_pixel_aspect_ratio(caps, &pixelAspectRatioNumerator, &pixelAspectRatioDenominator))) {
       gst_caps_unref(caps);
       return;
@@ -729 +729 @@
 
     // Calculate the largest scale factor that would fill the target surface
-    scale = MIN(rect.width() / displayWidth, rect.height() / displayHeight);
+    scale = std::min(rect.width() / displayWidth, rect.height() / displayHeight);
     // And calculate the new display width/height
     displayWidth *= scale;
@@ -796 +796 @@
             // Examples of what GStreamer can support but should not be added:
             // text/plain, text/html, image/jpeg, application/xml
-            if (g_str_equal(mimetype[0], "audio") ||
-                    g_str_equal(mimetype[0], "video") ||
-                    (g_str_equal(mimetype[0], "application") &&
-                        !ignoredApplicationSubtypes.contains(String(mimetype[1])))) {
+            if (g_str_equal(mimetype[0], "audio")
+                || g_str_equal(mimetype[0], "video")
+                || (g_str_equal(mimetype[0], "application")
+                    && !ignoredApplicationSubtypes.contains(String(mimetype[1])))) {
                 cache.add(String(capability[0]));
 
                 // These formats are supported by GStreamer, but not correctly advertised
-                if (g_str_equal(capability[0], "video/x-h264") ||
-                    g_str_equal(capability[0], "audio/x-m4a")) {
+                if (g_str_equal(capability[0], "video/x-h264")
+                    || g_str_equal(capability[0], "audio/x-m4a")) {
                     cache.add(String("video/mp4"));
                     cache.add(String("audio/aac"));
@@ -819 +819 @@
                     gchar** versionAndLayer = g_strsplit(capability[1], ",", 2);
 
-                    if (g_str_has_suffix (versionAndLayer[0], "(int)1")) {
+                    if (g_str_has_suffix(versionAndLayer[0], "(int)1")) {
                         for (int i = 0; versionAndLayer[1][i] != '\0'; i++) {
                             if (versionAndLayer[1][i] == '1')