Changeset 66023 in webkit


Ignore:
Timestamp:
Aug 25, 2010 10:51:26 AM (14 years ago)
Author:
eric.carlson@apple.com
Message:

2010-08-25 Eric Carlson <eric.carlson@apple.com>

Reviewed by Alexey Proskuryakov.

HTMLMediaElement.canPlayType must be case insensitive for MIME type.
https://bugs.webkit.org/show_bug.cgi?id=44577

  • platform/graphics/MediaPlayer.cpp: (WebCore::MediaPlayer::load): (WebCore::MediaPlayer::supportsType):

2010-08-24 Eric Carlson <eric.carlson@apple.com>

Reviewed by Alexey Proskuryakov.

HTMLMediaElement.canPlayType must be case insensitive for MIME type.
https://bugs.webkit.org/show_bug.cgi?id=44577

  • media/media-can-play-octet-stream-expected.txt:
  • media/media-can-play-octet-stream.html:
  • media/media-can-play-ogg-expected.txt:
  • media/media-can-play-ogg.html:
  • media/video-can-play-type-expected.txt:
  • media/video-can-play-type.html:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r66020 r66023  
     12010-08-24  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        HTMLMediaElement.canPlayType must be case insensitive for MIME type.
     6        https://bugs.webkit.org/show_bug.cgi?id=44577
     7
     8        * media/media-can-play-octet-stream-expected.txt:
     9        * media/media-can-play-octet-stream.html:
     10        * media/media-can-play-ogg-expected.txt:
     11        * media/media-can-play-ogg.html:
     12        * media/video-can-play-type-expected.txt:
     13        * media/video-can-play-type.html:
     14
    1152010-08-25  Tony Chang  <tony@chromium.org>
    216
  • trunk/LayoutTests/media/media-can-play-octet-stream-expected.txt

    r65758 r66023  
    22
    33++ Test with <video> element.
    4 EXPECTED (mediaElement.canPlayType('application/octet-stream') == 'maybe') OK
     4EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
    55EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
    66EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
    77
    88++ Test with <audio> element.
    9 EXPECTED (mediaElement.canPlayType('application/octet-stream') == 'maybe') OK
     9EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
    1010EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
    1111EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
  • trunk/LayoutTests/media/media-can-play-octet-stream.html

    r65758 r66023  
    1010            function test()
    1111            {
    12                 testExpected("mediaElement.canPlayType('application/octet-stream')", "maybe");
     12                testExpected("mediaElement.canPlayType('APPLICATION/octet-stream')", "maybe");
    1313                testExpected("mediaElement.canPlayType('application/octet-stream;codecs=theora')", "");
    1414                testExpected("mediaElement.canPlayType('application/octet-stream;codecs=mp4')", "");
  • trunk/LayoutTests/media/media-can-play-ogg-expected.txt

    r51784 r66023  
    11Test HTMLMediaElement canPlayType() method for ogg media containers.
    22
    3 EXPECTED (video.canPlayType('audio/ogg') == 'maybe') OK
    4 EXPECTED (video.canPlayType('video/ogg') == 'maybe') OK
     3EXPECTED (video.canPlayType('Audio/ogg') == 'maybe') OK
     4EXPECTED (video.canPlayType('Video/ogg') == 'maybe') OK
    55END OF TEST
    66
  • trunk/LayoutTests/media/media-can-play-ogg.html

    r51784 r66023  
    1515            video = mediaElement = document.getElementsByTagName('video')[0];
    1616
    17             testExpected("video.canPlayType('audio/ogg')", "maybe");
    18             testExpected("video.canPlayType('video/ogg')", "maybe");
     17            testExpected("video.canPlayType('Audio/ogg')", "maybe");
     18            testExpected("video.canPlayType('Video/ogg')", "maybe");
    1919
    2020            endTest();
  • trunk/LayoutTests/media/video-can-play-type-expected.txt

    r45758 r66023  
    44EXPECTED (video.canPlayType('video/') == '') OK
    55EXPECTED (video.canPlayType('video/blahblah') == '') OK
    6 EXPECTED (video.canPlayType('video/mpeg; codecs="avc1.4D400C"') == 'probably') OK
    7 EXPECTED (video.canPlayType(' video/mp4 ; video/mp4; codecs="mp4v.20.8, mp4a.40.2"') == 'probably') OK
     6EXPECTED (video.canPlayType('video/mpeg; Codecs="avc1.4D400C"') == 'probably') OK
     7EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably') OK
    88EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK
    9 EXPECTED (video.canPlayType('audio/wav') == 'maybe') OK
     9EXPECTED (video.canPlayType('audio/Wav') == 'maybe') OK
    1010END OF TEST
    1111
  • trunk/LayoutTests/media/video-can-play-type.html

    r46857 r66023  
    1919            testExpected("video.canPlayType('video/')", "");
    2020            testExpected("video.canPlayType('video/blahblah')", "");
    21             testExpected("video.canPlayType('video/mpeg; codecs=&quot;avc1.4D400C&quot;')", "probably");
    22             testExpected("video.canPlayType('        video/mp4  ; video/mp4; codecs=&quot;mp4v.20.8, mp4a.40.2&quot;')", "probably");
     21            testExpected("video.canPlayType('video/mpeg; Codecs=&quot;avc1.4D400C&quot;')", "probably");
     22            testExpected("video.canPlayType('        Video/MP4 ; CODECS=&quot;mp4v.20.8, mp4a.40.2&quot;')", "probably");
    2323            testExpected("video.canPlayType('audio/mpeg')", "maybe");
    24             testExpected("video.canPlayType('audio/wav')", "maybe");
     24            testExpected("video.canPlayType('audio/Wav')", "maybe");
    2525
    2626            endTest();
  • trunk/WebCore/ChangeLog

    r66021 r66023  
     12010-08-25  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        HTMLMediaElement.canPlayType must be case insensitive for MIME type.
     6        https://bugs.webkit.org/show_bug.cgi?id=44577
     7
     8        * platform/graphics/MediaPlayer.cpp:
     9        (WebCore::MediaPlayer::load):
     10        (WebCore::MediaPlayer::supportsType):
     11
    1122010-08-25  Xan Lopez  <xlopez@igalia.com>
    213
  • trunk/WebCore/platform/graphics/MediaPlayer.cpp

    r65779 r66023  
    274274void MediaPlayer::load(const String& url, const ContentType& contentType)
    275275{
    276     String type = contentType.type();
     276    String type = contentType.type().lower();
    277277    String typeCodecs = contentType.parameter(codecs());
    278278
     
    557557MediaPlayer::SupportsType MediaPlayer::supportsType(ContentType contentType)
    558558{
    559     String type = contentType.type();
     559    String type = contentType.type().lower();
    560560    String typeCodecs = contentType.parameter(codecs());
    561561
     
    573573
    574574    MediaPlayerFactory* engine = chooseBestEngineForTypeAndCodecs(type, typeCodecs);
    575 
    576575    if (!engine)
    577576        return IsNotSupported;
Note: See TracChangeset for help on using the changeset viewer.