external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Support HTTP-FLV and HLS for srs-player by H5. 4.0.63

Browse source
This commit is contained in:
winlin 2021-01-20 20:36:30 +08:00
parent 5c41766b79
commit 979bf86e8b
4 changed files with 42 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

0
trunk/research/players/js/flv-1.5.0.min.js.map → trunk/research/players/js/flv.min.js.map
View file

0
trunk/research/players/js/hls-0.14.17.min.js.map → trunk/research/players/js/hls.min.js.map
View file

12
trunk/research/players/rtc_player.html
View file

@ -49,7 +49,7 @@
</div>
<label></label>
<video id="rtc_media_player" width="100%" controls autoplay></video>
<video id="rtc_media_player" controls autoplay></video>
<label></label>
SessionID: <span id='sessionid'></span>
@ -312,10 +312,16 @@
var query = parse_query_string();
srs_init_rtc("#txt_url", query);
$("#btn_play").click(startPlay);
$("#btn_play").click(function() {
$('#rtc_media_player').prop('muted', false);
startPlay();
});
if (query.autostart === 'true') {
// For autostart, we should mute it, see https://www.jianshu.com/p/c3c6944eed5a
$('#rtc_media_player').prop('muted', true);
console.warn('For autostart, we should mute it, see https://www.jianshu.com/p/c3c6944eed5a ' +
'or https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#audiovideo_elements');
startPlay();
}
});

38
trunk/research/players/srs_player.html
View file

@ -122,12 +122,25 @@
var flvPlayer = null;
var hlsPlayer = null;
var stopPlayers = function () {
if (flvPlayer) {
flvPlayer.destroy();
flvPlayer = null;
}
if (hlsPlayer) {
hlsPlayer.destroy();
hlsPlayer = null;
}
};
var hide_for_error = function () {
$('#main_flash_alert').show();
$('#main_info').hide();
$('#main_tips').hide();
$('#video_player').hide();
//$('#btn_play').hide();
stopPlayers();
};
var show_for_ok = function () {
@ -157,20 +170,18 @@
$("#player_url").text($("#txt_url").val()).attr("href", url);
$("#link_url").attr("href", url);
// Stop players.
if (flvPlayer) {
flvPlayer.destroy();
}
if (hlsPlayer) {
hlsPlayer.destroy();
}
// For RTMP, not support.
if (r.schema === 'rtmp') {
hide_for_error();
return;
}
return r;
};
var start_play = function (r) {
stopPlayers();
// Start play HTTP-FLV.
if (r.stream.indexOf('.flv') > 0) {
if (!flvjs.isSupported()) {
@ -211,7 +222,9 @@
});
$("#btn_play").click(function(){
apply_url_change();
$('#video_player').prop('muted', false);
var r = apply_url_change();
start_play(r);
});
/****
@ -238,7 +251,12 @@
srs_init_rtmp("#txt_url");
if (query.autostart === "true") {
apply_url_change();
$('#video_player').prop('muted', true);
console.warn('For autostart, we should mute it, see https://www.jianshu.com/p/c3c6944eed5a ' +
'or https://developers.google.com/web/updates/2017/09/autoplay-policy-changes#audiovideo_elements');
var r = apply_url_change();
start_play(r);
}
</script>
</html>