Changeset 66023 in webkit
- Timestamp:
- Aug 25, 2010 10:51:26 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r66020 r66023 1 2010-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 1 15 2010-08-25 Tony Chang <tony@chromium.org> 2 16 -
trunk/LayoutTests/media/media-can-play-octet-stream-expected.txt
r65758 r66023 2 2 3 3 ++ Test with <video> element. 4 EXPECTED (mediaElement.canPlayType(' application/octet-stream') == 'maybe') OK4 EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK 5 5 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK 6 6 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK 7 7 8 8 ++ Test with <audio> element. 9 EXPECTED (mediaElement.canPlayType(' application/octet-stream') == 'maybe') OK9 EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK 10 10 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK 11 11 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK -
trunk/LayoutTests/media/media-can-play-octet-stream.html
r65758 r66023 10 10 function test() 11 11 { 12 testExpected("mediaElement.canPlayType(' application/octet-stream')", "maybe");12 testExpected("mediaElement.canPlayType('APPLICATION/octet-stream')", "maybe"); 13 13 testExpected("mediaElement.canPlayType('application/octet-stream;codecs=theora')", ""); 14 14 testExpected("mediaElement.canPlayType('application/octet-stream;codecs=mp4')", ""); -
trunk/LayoutTests/media/media-can-play-ogg-expected.txt
r51784 r66023 1 1 Test HTMLMediaElement canPlayType() method for ogg media containers. 2 2 3 EXPECTED (video.canPlayType(' audio/ogg') == 'maybe') OK4 EXPECTED (video.canPlayType(' video/ogg') == 'maybe') OK3 EXPECTED (video.canPlayType('Audio/ogg') == 'maybe') OK 4 EXPECTED (video.canPlayType('Video/ogg') == 'maybe') OK 5 5 END OF TEST 6 6 -
trunk/LayoutTests/media/media-can-play-ogg.html
r51784 r66023 15 15 video = mediaElement = document.getElementsByTagName('video')[0]; 16 16 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"); 19 19 20 20 endTest(); -
trunk/LayoutTests/media/video-can-play-type-expected.txt
r45758 r66023 4 4 EXPECTED (video.canPlayType('video/') == '') OK 5 5 EXPECTED (video.canPlayType('video/blahblah') == '') OK 6 EXPECTED (video.canPlayType('video/mpeg; codecs="avc1.4D400C"') == 'probably') OK7 EXPECTED (video.canPlayType(' video/mp4 ; video/mp4; codecs="mp4v.20.8, mp4a.40.2"') == 'probably') OK6 EXPECTED (video.canPlayType('video/mpeg; Codecs="avc1.4D400C"') == 'probably') OK 7 EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably') OK 8 8 EXPECTED (video.canPlayType('audio/mpeg') == 'maybe') OK 9 EXPECTED (video.canPlayType('audio/ wav') == 'maybe') OK9 EXPECTED (video.canPlayType('audio/Wav') == 'maybe') OK 10 10 END OF TEST 11 11 -
trunk/LayoutTests/media/video-can-play-type.html
r46857 r66023 19 19 testExpected("video.canPlayType('video/')", ""); 20 20 testExpected("video.canPlayType('video/blahblah')", ""); 21 testExpected("video.canPlayType('video/mpeg; codecs="avc1.4D400C"')", "probably");22 testExpected("video.canPlayType(' video/mp4 ; video/mp4; codecs="mp4v.20.8, mp4a.40.2"')", "probably");21 testExpected("video.canPlayType('video/mpeg; Codecs="avc1.4D400C"')", "probably"); 22 testExpected("video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"')", "probably"); 23 23 testExpected("video.canPlayType('audio/mpeg')", "maybe"); 24 testExpected("video.canPlayType('audio/ wav')", "maybe");24 testExpected("video.canPlayType('audio/Wav')", "maybe"); 25 25 26 26 endTest(); -
trunk/WebCore/ChangeLog
r66021 r66023 1 2010-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 1 12 2010-08-25 Xan Lopez <xlopez@igalia.com> 2 13 -
trunk/WebCore/platform/graphics/MediaPlayer.cpp
r65779 r66023 274 274 void MediaPlayer::load(const String& url, const ContentType& contentType) 275 275 { 276 String type = contentType.type() ;276 String type = contentType.type().lower(); 277 277 String typeCodecs = contentType.parameter(codecs()); 278 278 … … 557 557 MediaPlayer::SupportsType MediaPlayer::supportsType(ContentType contentType) 558 558 { 559 String type = contentType.type() ;559 String type = contentType.type().lower(); 560 560 String typeCodecs = contentType.parameter(codecs()); 561 561 … … 573 573 574 574 MediaPlayerFactory* engine = chooseBestEngineForTypeAndCodecs(type, typeCodecs); 575 576 575 if (!engine) 577 576 return IsNotSupported;
Note: See TracChangeset
for help on using the changeset viewer.