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

Merge SRS4

Browse source
This commit is contained in:
winlin 2020-12-24 18:51:04 +08:00
commit f9444c376c
5 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@
function SrsRtcPlayerAsync() {
var self = {};
// @see https://github.com/rtcdn/rtcdn-draft
// @url The WebRTC url to play with, for example:
// webrtc://r.ossrs.net/live/livestream
// or specifies the API port:

1
trunk/research/players/rtc_publisher.html
View file

@ -69,6 +69,7 @@
function SrsRtcPublisherAsync() {
var self = {};
// @see https://github.com/rtcdn/rtcdn-draft
// @url The WebRTC url to play with, for example:
// webrtc://r.ossrs.net/live/livestream
// or specifies the API port:

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

@ -448,6 +448,8 @@
$(player).attr("id", "player_id");
$(div_container).append(player);
apply_url_change();
srs_player = new SrsPlayer("player_id", srs_get_player_width(), srs_get_player_height());
srs_player.on_player_ready = function() {
var buffer_time = 0.5;
@ -563,6 +565,8 @@
}
var queries = user_extra_params(query);
queries = user_extra_params(rtmp, queries);
if (queries && queries.length) {
url += '&' + queries.join('&');
}