Merge 6c4e1b8c87 into 0f980d49a6
This commit is contained in:
commit
313abaf984
|
|
@ -230,11 +230,13 @@
|
||||||
|
|
||||||
// Start play HLS.
|
// Start play HLS.
|
||||||
if (r.stream.indexOf('.m3u8') > 0) {
|
if (r.stream.indexOf('.m3u8') > 0) {
|
||||||
if (!Hls.isSupported()) {
|
if (video.canPlayType('application/vnd.apple.mpegurl')) {
|
||||||
hide_for_error();
|
$('#video_player').attr('src', r.url).show();
|
||||||
|
show_for_video_ok();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Hls.isSupported()) {
|
||||||
show_for_video_ok();
|
show_for_video_ok();
|
||||||
|
|
||||||
// See https://github.com/video-dev/hls.js/blob/master/docs/API.md#maxlivesyncplaybackrate
|
// See https://github.com/video-dev/hls.js/blob/master/docs/API.md#maxlivesyncplaybackrate
|
||||||
|
|
@ -255,6 +257,10 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hide_for_error();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Start play MPEG-DASH.
|
// Start play MPEG-DASH.
|
||||||
if (r.stream.indexOf('.mpd') > 0) {
|
if (r.stream.indexOf('.mpd') > 0) {
|
||||||
show_for_video_ok();
|
show_for_video_ok();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user