Skip to content
Permalink
Browse files
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.

Canonical link: https://commits.webkit.org/67577@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@77494 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn committed Feb 3, 2011
1 parent fbedd43 commit dd90beb079b34c72b03fbc3b95940487ae0de57c
Showing 4 changed files with 34 additions and 5 deletions.
@@ -1,3 +1,12 @@
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>

Unreviewed, skipping 2 more websocket tests on GTK, see bug 53683.
@@ -4696,9 +4696,6 @@ http/tests/security/local-user-CSS-from-remote.html
# See https://bugs.webkit.org/show_bug.cgi?id=53056
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
media/audio-delete-while-slider-thumb-clicked.html
@@ -1,3 +1,13 @@
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>

Reviewed by Sam Weinig.
@@ -1384,11 +1384,15 @@ static HashSet<String> mimeTypeCache()

// 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;
}

@@ -1466,6 +1470,15 @@ static HashSet<String> mimeTypeCache()
for (int index = 0; extensions[index]; index++) {
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"));
}
}
}

0 comments on commit dd90beb

Please sign in to comment.