Changeset 83836 in webkit

Timestamp:

Apr 14, 2011 4:41:11 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-14 Nancy Piedra <​nancy.piedra@nokia.com>

Reviewed by Benjamin Poulain.

Added additional test for parsing codecs parameter.
​https://bugs.webkit.org/show_bug.cgi?id=58188

• media/video-can-play-type-expected.txt:
• media/video-can-play-type.html:

2011-04-14 Nancy Piedra <​nancy.piedra@nokia.com>

Reviewed by Benjamin Poulain.

[Qt] MediaPlayerPrivateQt::supportsType does not parse codec parameter
​https://bugs.webkit.org/show_bug.cgi?id=58188

The codec parameter in MediaPlayerPrivateQt::supportsType was not parsed into
a QStringList. This change parses and trims the list.

An additional test was added to video-can-play-type.html to test parsing of codec parameter.

• platform/graphics/qt/MediaPlayerPrivateQt.cpp: (WebCore::MediaPlayerPrivateQt::supportsType):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-can-play-type-expected.txt (modified) (1 diff)
• LayoutTests/media/video-can-play-type.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-14  Nancy Piedra  <nancy.piedra@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+
+        Added additional test for parsing codecs parameter.
+        https://bugs.webkit.org/show_bug.cgi?id=58188
+
+        * media/video-can-play-type-expected.txt:
+        * media/video-can-play-type.html:
+
 2011-04-14  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/media/video-can-play-type-expected.txt

@@ -8 +8 @@
 EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK
 EXPECTED (video.canPlayType('audio/Wav') == 'maybe') OK
+EXPECTED (video.canPlayType('video/blahblah; codecs="blah, , blah"') == '') OK
 EXPECTED (video.canPlayType('video/blahblah; codecs=blah') == '') OK
 EXPECTED (video.canPlayType('video/blahblah; codecs="blah"') == '') OK

trunk/LayoutTests/media/video-can-play-type.html

@@ -23 +23 @@
             testExpected("video.canPlayType('audio/mpeg')", "maybe");
             testExpected("video.canPlayType('audio/Wav')", "maybe");
+            testExpected("video.canPlayType('video/blahblah; codecs=\"blah,  , blah\"')", "");
             testExpected("video.canPlayType('video/blahblah; codecs=blah')", "");
             testExpected("video.canPlayType('video/blahblah; codecs=\"blah\"')", "");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Nancy Piedra  <nancy.piedra@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] MediaPlayerPrivateQt::supportsType does not parse codec parameter
+        https://bugs.webkit.org/show_bug.cgi?id=58188
+
+        The codec parameter in MediaPlayerPrivateQt::supportsType was not parsed into
+        a QStringList. This change parses and trims the list.
+
+        An additional test was added to video-can-play-type.html to test parsing of codec parameter.
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::supportsType):
+
 2011-04-14  Zoltan Herczeg  <zherczeg@webkit.org>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -85 +85 @@
         return MediaPlayer::IsNotSupported;
 
-    if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMultimediaKit::ProbablySupported)
+    // Parse and trim codecs.
+    QString codecStr = codec;
+    QStringList codecList = codecStr.split(QLatin1Char(','), QString::SkipEmptyParts);
+    QStringList codecListTrimmed;
+    foreach (const QString& codecStrNotTrimmed, codecList) {
+        QString codecStrTrimmed = codecStrNotTrimmed.trimmed();
+        if (!codecStrTrimmed.isEmpty())
+            codecListTrimmed.append(codecStrTrimmed);
+    }
+
+    if (QMediaPlayer::hasSupport(mime, codecListTrimmed) >= QtMultimediaKit::ProbablySupported)
         return MediaPlayer::IsSupported;