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

For #1638, #307, refactor rtc player.

Browse source
This commit is contained in:
winlin 2020-03-18 10:03:20 +08:00
parent e2233027b8
commit c210c0b2f5
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@
</footer> </footer>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
var pc = null; // Global handler to do cleanup when replaying.
$(function(){ $(function(){
$('#rtc_media_player').hide(); $('#rtc_media_player').hide();
var query = parse_query_string(); var query = parse_query_string();
@ -63,7 +64,12 @@
var urlObject = parse_rtmp_url($("#txt_url").val()); var urlObject = parse_rtmp_url($("#txt_url").val());
var schame = window.location.protocol; var schame = window.location.protocol;
var pc = new RTCPeerConnection(null); // Close PC when user replay.
if (pc) {
pc.close();
}
pc = new RTCPeerConnection(null);
pc.onaddstream = function (event) { pc.onaddstream = function (event) {
var player = document.getElementById('rtc_media_player'); var player = document.getElementById('rtc_media_player');
player.srcObject = event.stream; player.srcObject = event.stream;

3
trunk/src/app/srs_app_rtp.cpp
View file

@ -76,9 +76,6 @@ srs_error_t SrsRtpMuxer::frame_to_packet(SrsSharedPtrMessage* shared_frame, SrsF
for (int i = 0; i < format->video->nb_samples; ++i) { for (int i = 0; i < format->video->nb_samples; ++i) {
SrsSample sample = format->video->samples[i]; SrsSample sample = format->video->samples[i];
uint8_t header = sample.bytes[0];
uint8_t nal_type = header & kNalTypeMask;
if (sample.size <= max_payload_size) { if (sample.size <= max_payload_size) {
if ((err = packet_single_nalu(shared_frame, format, &sample, rtp_packet_vec)) != srs_success) { if ((err = packet_single_nalu(shared_frame, format, &sample, rtp_packet_vec)) != srs_success) {
return srs_error_wrap(err, "packet single nalu"); return srs_error_wrap(err, "packet single nalu");