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 remote-tracking branch 'upstream/feature/rtc' into sdp

Browse source
This commit is contained in:
xiaozhihong 2020-03-30 15:16:44 +08:00
commit 9dadcdffd6
45 changed files with 740 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,9 +15,7 @@
<script type="text/javascript" src="js/srs.page.js"></script>
</head>
<body>
<!--
<img src='https://ossrs.net:8443/gif/v1/sls.gif?site=ossrs.net&path=/player/srsplayer'/>
-->
<img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/rtc'/>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
@ -58,7 +56,7 @@
var startPlay = function() {
$('#rtc_media_player').show();
var urlObject = parse_rtmp_url($("#txt_url").val());
var schame = window.location.protocol;
var schema = window.location.protocol;
// Close PC when user replay.
if (pc) {
@ -82,7 +80,7 @@
return pc.setLocalDescription(offer).then(function(){ return offer; });
}).then(function(offer) {
return new Promise(function(resolve, reject) {
var port = urlObject.user_query.api || 1985;
var port = urlObject.port || 1985;
// @see https://github.com/rtcdn/rtcdn-draft
var api = urlObject.user_query.play || '/rtc/v1/play/';
@ -90,7 +88,7 @@
api += '/';
}
var url = schame + '//' + urlObject.server + ':' + port + api;
var url = schema + '//' + urlObject.server + ':' + port + api;
for (var key in urlObject.user_query) {
if (key != 'api' && key != 'play') {
url += '&' + key + '=' + urlObject.user_query[key];