Changeset 77494 in webkit

Timestamp:

Feb 3, 2011 8:29:19 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-01-27 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GTK] LayoutTests/media/audio-mpeg4-supported.html fails
​https://bugs.webkit.org/show_bug.cgi?id=53125

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::mimeTypeCache): Add audio/x-m4a mimetype in the cache.

LayoutTests:

2011-01-27 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GTK] LayoutTests/media/audio-mpeg4-supported.html fails
​https://bugs.webkit.org/show_bug.cgi?id=53125

• platform/gtk/Skipped: Unskip fixed test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-27  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=53125
+
+        * platform/gtk/Skipped: Unskip fixed test.
+
 2011-02-03  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -4697 +4697 @@
 media/unsupported-rtsp.html
 
-# This media test fails; possibly because the AAC codec is not installed on the test bots:
-# https://bugs.webkit.org/show_bug.cgi?id=53125
-media/audio-mpeg4-supported.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=53247

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-27  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=53125
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache): Add audio/x-m4a mimetype in the cache.
+
 2011-02-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -1385 +1385 @@
                 // These formats are supported by GStreamer, but not
                 // correctly advertised.
-                if (g_str_equal(name, "video/x-h264")
-                    || g_str_equal(name, "audio/x-m4a")) {
+                if (g_str_equal(name, "video/x-h264")) {
                     cache.add(String("video/mp4"));
+                    cached = true;
+                }
+
+                if (g_str_equal(name, "audio/x-m4a")) {
                     cache.add(String("audio/aac"));
                     cache.add(String("audio/mp4"));
+                    cache.add(String("audio/x-m4a"));
                     cached = true;
                 }
@@ -1467 +1471 @@
                         if (g_str_equal(extensions[index], "m4v"))
                             cache.add(String("video/x-m4v"));
+
+                        // Workaround for
+                        // https://bugzilla.gnome.org/show_bug.cgi?id=640709.
+                        // typefindfunctions <= 0.10.32 doesn't
+                        // register the H264 typefinder correctly so
+                        // as a workaround we check the registered
+                        // file extensions for it.
+                        if (g_str_equal(extensions[index], "h264"))
+                            cache.add(String("video/mp4"));
                     }
                 }