-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support Simulcast Stream (RID Based Simulcast) (ossrs#2659)
* fix typo. * refactor: update rtc conn. * feat(simulcast): add rtc_publisher_simulcast page. * feat(kSimulcastApiVersionSpecCompliant/js): update txt url in simulcast page. * feat(kSimulcastApiVersionSpecCompliant): support simulcast, use layer=N * Refine(rtc/negotiate_publish_capability): add set_audio_track_desc/set_video_track_descs. * fix: add msid and msid tracker. * feat(kSimulcastApiVersionSpecCompliant): support layer=high,mid,low * feat(simulcast): add x-google-min-bitrate=5000;x-google-max-bitrate=8000;x-google-start-bitrate=6000 * add note about janus_rtp_header/janus_rtp_header_extension and helper functions. * fix build in c++03. ./configure --cxx11=off --cxx14=off --ffmpeg-fit=off * Refactor rid base simulcast code * Mofidy x-google* from cpp code to html Co-authored-by: hondaxiao <hondaxiao@tencent.com>
- Loading branch information
1 parent
f216f47
commit cf83772
Showing
20 changed files
with
631 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>SRS</title> | ||
| <meta charset="utf-8"> | ||
| <style> | ||
| body{ | ||
| padding-top: 30px; | ||
| } | ||
| </style> | ||
| <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/> | ||
| <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script> | ||
| <script type="text/javascript" src="js/adapter-7.4.0.min.js"></script> | ||
| <script type="text/javascript" src="js/srs.sdk.js"></script> | ||
| <script type="text/javascript" src="js/winlin.utility.js"></script> | ||
| <script type="text/javascript" src="js/sdp.js"></script> | ||
| <script type="text/javascript" src="js/srs.page.js"></script> | ||
| </head> | ||
| <body> | ||
| <img src='https://ossrs.net/gif/v1/sls.gif?site=ossrs.net&path=/player/rtcpublisher'/> | ||
| <div class="navbar navbar-fixed-top"> | ||
| <div class="navbar-inner"> | ||
| <div class="container"> | ||
| <a id="srs_index" class="brand" href="https://github.com/ossrs/srs">SRS</a> | ||
| <div class="nav-collapse collapse"> | ||
| <ul class="nav"> | ||
| <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> | ||
| <li><a id="nav_rtc_player" href="rtc_player.html">RTC播放器</a></li> | ||
| <li><a id="nav_rtc_publisher" href="rtc_publisher.html">RTC推流</a></li> | ||
| <li class="active"><a id="nav_rtc_publisher_simulcast" href="rtc_publisher_simulcast.html">Simulcast推流</a></li> | ||
| <li><a href="http://ossrs.net/srs.release/releases/app.html">iOS/Andriod</a></li> | ||
| <!--<li><a id="nav_srs_publisher" href="srs_publisher.html">SRS编码器</a></li>--> | ||
| <!--<li><a id="nav_srs_chat" href="srs_chat.html">SRS会议</a></li>--> | ||
| <!--<li><a id="nav_srs_bwt" href="srs_bwt.html">SRS测网速</a></li>--> | ||
| <!--<li><a id="nav_vlc" href="vlc.html">VLC播放器</a></li>--> | ||
| <!--<li><a id="nav_gb28181" href="srs_gb28181.html">GB28181</a></li>--> | ||
| <li> | ||
| <a href="https://github.com/ossrs/srs"> | ||
| <img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ossrs/srs?style=social"> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="container"> | ||
| <div class="form-inline"> | ||
| URL: | ||
| <input type="text" id="txt_url" class="input-xxlarge" value=""> | ||
| <button class="btn btn-primary" id="btn_publish">开始推流</button> | ||
| </div> | ||
|
|
||
| <label></label> | ||
| <video id="rtc_media_player" width="320" autoplay muted></video> | ||
|
|
||
| <label></label> | ||
| SessionID: <span id='sessionid'></span> | ||
|
|
||
| <label></label> | ||
| <input type="checkbox" id="audio-check-box" name="audio-check-box" value="enabled" checked onclick="switchMediaState(this)">Audio: </input> | ||
| <span id='acodecs'></span><br/> | ||
| <input type="checkbox" id="video-check-box" name="video-check-box" value="enabled" checked onclick="switchMediaState(this)" disabled="disabled">Video:</input> | ||
| <span id='vcodecs'></span> | ||
|
|
||
| <label></label> | ||
| Simulator: <a href='#' id='simulator-drop'>Drop</a> | ||
|
|
||
| <footer> | ||
| <p></p> | ||
| <p><a href="https://github.com/ossrs/srs">SRS Team © 2020</a></p> | ||
| </footer> | ||
| </div> | ||
| <script type="text/javascript"> | ||
|
|
||
| function switchMediaState (obj) { | ||
| if (obj.value === 'enabled') { | ||
| obj.value = 'disabled' | ||
| } else { | ||
| obj.value = 'enabled' | ||
| } | ||
| } | ||
|
|
||
| $(function(){ | ||
| var sdk = null; // Global handler to do cleanup when republishing. | ||
| var startPublish = function() { | ||
| $('#rtc_media_player').show(); | ||
|
|
||
| // Close PC when user replay. | ||
| if (sdk) { | ||
| sdk.close(); | ||
| } | ||
| sdk = new SrsRtcPublisherAsync(); | ||
| if ($("#audio-check-box").val() === 'disabled') { | ||
| delete sdk.constraints.audio | ||
| console.log('audio', $("#audio-check-box").val(), 'video', $("#video-check-box").val()) | ||
| console.log('sdk.constraints', sdk.constraints) | ||
| } | ||
|
|
||
| // User should set the stream when publish is done, @see https://webrtc.org/getting-started/media-devices | ||
| // However SRS SDK provides a consist API like https://webrtc.org/getting-started/remote-streams | ||
| // Optional callback, SDK will add track to stream. | ||
| // sdk.ontrack = function (event) { console.log('Got track', event); sdk.stream.addTrack(event.track); }; | ||
|
|
||
| // https://developer.mozilla.org/en-US/docs/Web/Media/Formats/WebRTC_codecs#getting_the_supported_codecs | ||
| sdk.pc.onicegatheringstatechange = function (event) { | ||
| if (sdk.pc.iceGatheringState === "complete") { | ||
| $('#acodecs').html(SrsRtcFormatSenders(sdk.pc.getSenders(), "audio")); | ||
| $('#vcodecs').html(SrsRtcFormatSenders(sdk.pc.getSenders(), "video")); | ||
| } | ||
| }; | ||
|
|
||
| // For example: webrtc://r.ossrs.net/live/livestream | ||
| var url = $("#txt_url").val(); | ||
| if (-1 === url.indexOf("?numberOfSimulcastLayers=spec3")) { | ||
| $("#txt_url").val(`${url}?numberOfSimulcastLayers=spec3`); | ||
| url = $("#txt_url").val(); | ||
| } | ||
| sdk.publish(url).then(function(session){ | ||
| $('#rtc_media_player').prop('srcObject', sdk.stream); | ||
| $('#sessionid').html(session.sessionid); | ||
| $('#simulator-drop').attr('href', session.simulator + '?drop=1&username=' + session.sessionid); | ||
| }).catch(function (reason) { | ||
| sdk.close(); | ||
| $('#rtc_media_player').hide(); | ||
| console.error(reason); | ||
| }); | ||
| }; | ||
|
|
||
| $('#rtc_media_player').hide(); | ||
| var query = parse_query_string(); | ||
| srs_init_rtc("#txt_url", query); | ||
|
|
||
| $("#btn_publish").click(startPublish); | ||
| if (query.autostart === 'true') { | ||
| startPublish(); | ||
| } | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.