web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-08 12:05:47 +02:00
Code Releases Activity

Close GH-805: Flash - ignore codec info - added tests for #785.

Browse Source
This commit is contained in:
Matthew McClure 2013-10-29 11:00:54 -07:00 committed by Steve Heffernan
parent 6e3eb5075e
commit 4c6a12898b
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/media/flash.js
View File

@ -331,7 +331,16 @@ vjs.Flash.isSupported = function(){
}; };
vjs.Flash.canPlaySource = function(srcObj){ vjs.Flash.canPlaySource = function(srcObj){
if (srcObj.type in vjs.Flash.formats || srcObj.type in vjs.Flash.streamingFormats) { return 'maybe'; } var type;
if (!srcObj.type) {
return '';
}
type = srcObj.type.replace(/;.*/,'').toLowerCase();
if (type in vjs.Flash.formats || type in vjs.Flash.streamingFormats) {
return 'maybe';
}
}; };
vjs.Flash.formats = { vjs.Flash.formats = {

18
test/unit/flash.js
View File

@ -45,4 +45,20 @@ test('test isStreamingSrc', function() {
ok(!isStreamingSrc('http://streaming.is/fun')); ok(!isStreamingSrc('http://streaming.is/fun'));
ok(!isStreamingSrc('https://streaming.is/fun')); ok(!isStreamingSrc('https://streaming.is/fun'));
ok(!isStreamingSrc('file://streaming.is/fun')); ok(!isStreamingSrc('file://streaming.is/fun'));
}); });
test('test canPlaySource', function() {
var canPlaySource = vjs.Flash.canPlaySource;
// supported
ok(canPlaySource({ type: 'video/mp4; codecs=avc1.42E01E,mp4a.40.2' }), 'codecs supported');
ok(canPlaySource({ type: 'video/mp4' }), 'video/mp4 supported');
ok(canPlaySource({ type: 'video/x-flv' }), 'video/x-flv supported');
ok(canPlaySource({ type: 'video/flv' }), 'video/flv supported');
ok(canPlaySource({ type: 'video/m4v' }), 'video/m4v supported');
ok(canPlaySource({ type: 'VIDEO/FLV' }), 'capitalized mime type');
// not supported
ok(!canPlaySource({ type: 'video/webm; codecs="vp8, vorbis"' }));
ok(!canPlaySource({ type: 'video/webm' }));
});