From 1e8374948567e99207f60a06606270432fce2773 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 9 Apr 2020 09:56:13 +0800 Subject: [PATCH 01/79] For #307, use RTC server to sendmmsg --- trunk/src/app/srs_app_rtc_conn.cpp | 78 +++++++++++++++++------------- trunk/src/app/srs_app_rtc_conn.hpp | 5 +- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 9c6c3cf8f..5305771e0 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -205,10 +205,15 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* udp_mux_skt) } } - if (out_bio_len) { - if ((err = udp_mux_skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { - return srs_error_wrap(err, "send dtls packet"); - } + if (out_bio_len) { + srs_netfd_t stfd = udp_mux_skt->stfd(); + sockaddr_in* addr = udp_mux_skt->peer_addr(); + socklen_t addrlen = udp_mux_skt->peer_addrlen(); + + char* buf = new char[out_bio_len]; + memcpy(buf, out_bio_data, out_bio_len); + + rtc_session->send_and_free_messages(stfd, addr, addrlen, buf, out_bio_len); } return err; @@ -576,7 +581,10 @@ void SrsRtcSenderThread::send_and_free_messages(SrsSharedPtrMessage** msgs, int { srs_error_t err = srs_success; - vector mhdrs; + srs_netfd_t stfd = udp_mux_skt->stfd(); + sockaddr_in* addr = udp_mux_skt->peer_addr(); + socklen_t addrlen = udp_mux_skt->peer_addrlen(); + for (int i = 0; i < nb_msgs; i++) { SrsSharedPtrMessage* msg = msgs[i]; @@ -609,24 +617,11 @@ void SrsRtcSenderThread::send_and_free_messages(SrsSharedPtrMessage** msgs, int memcpy(buf, pkt->payload, length); } - mmsghdr mhdr; - memset(&mhdr, 0, sizeof(mmsghdr)); - mhdr.msg_hdr.msg_name = (sockaddr_in*)udp_mux_skt->peer_addr(); - mhdr.msg_hdr.msg_namelen = udp_mux_skt->peer_addrlen(); - mhdr.msg_hdr.msg_iovlen = 1; - mhdr.msg_hdr.msg_iov = new iovec(); - mhdr.msg_hdr.msg_iov->iov_base = buf; - mhdr.msg_hdr.msg_iov->iov_len = length; - mhdrs.push_back(mhdr); + rtc_session->send_and_free_messages(stfd, addr, addrlen, buf, length); } srs_freep(msg); } - - if ((err = rtc_session->rtc_server->send_and_free_messages(udp_mux_skt->stfd(), mhdrs)) != srs_success) { - srs_warn("sendmsg %d msgs, err %s", mhdrs.size(), srs_error_summary(err).c_str()); - srs_freep(err); - } } SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id) @@ -728,9 +723,6 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* udp_mux_skt, SrsS } SrsStunPacket stun_binding_response; - char buf[1460]; - SrsBuffer* stream = new SrsBuffer(buf, sizeof(buf)); - SrsAutoFree(SrsBuffer, stream); stun_binding_response.set_message_type(BindingResponse); stun_binding_response.set_local_ufrag(stun_req->get_remote_ufrag()); @@ -740,13 +732,18 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* udp_mux_skt, SrsS stun_binding_response.set_mapped_address(be32toh(inet_addr(udp_mux_skt->get_peer_ip().c_str()))); stun_binding_response.set_mapped_port(udp_mux_skt->get_peer_port()); + char* buf = new char[1460]; + SrsBuffer* stream = new SrsBuffer(buf, 1460); + SrsAutoFree(SrsBuffer, stream); + if ((err = stun_binding_response.encode(get_local_sdp()->get_ice_pwd(), stream)) != srs_success) { return srs_error_wrap(err, "stun binding response encode failed"); } - if ((err = udp_mux_skt->sendto(stream->data(), stream->pos(), 0)) != srs_success) { - return srs_error_wrap(err, "stun binding response send failed"); - } + srs_netfd_t stfd = udp_mux_skt->stfd(); + sockaddr_in* addr = udp_mux_skt->peer_addr(); + socklen_t addrlen = udp_mux_skt->peer_addrlen(); + send_and_free_messages(stfd, addr, addrlen, buf, stream->pos()); if (get_session_state() == WAITING_STUN) { set_session_state(DOING_DTLS_HANDSHAKE); @@ -837,13 +834,17 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock for (int i = 0; i < (int)resend_pkts.size(); ++i) { if (dtls_session) { - char protected_buf[kRtpPacketSize]; + char* protected_buf = new char[kRtpPacketSize]; int nb_protected_buf = resend_pkts[i]->size; srs_verbose("resend pkt sequence=%u", resend_pkts[i]->rtp_header.get_sequence()); dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); - udp_mux_skt->sendto(protected_buf, nb_protected_buf, 0); + + srs_netfd_t stfd = udp_mux_skt->stfd(); + sockaddr_in* addr = udp_mux_skt->peer_addr(); + socklen_t addrlen = udp_mux_skt->peer_addrlen(); + send_and_free_messages(stfd, addr, addrlen, protected_buf, nb_protected_buf); } } @@ -1085,6 +1086,11 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* udp_mux_skt) return err; } +void SrsRtcSession::send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length) +{ + rtc_server->send_and_free_messages(stfd, addr, addrlen, buf, length); +} + SrsRtcServer::SrsRtcServer() { listener = NULL; @@ -1344,19 +1350,25 @@ srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tic return srs_success; } -srs_error_t SrsRtcServer::send_and_free_messages(srs_netfd_t stfd, const vector& msgs) +void SrsRtcServer::send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length) { - srs_error_t err = srs_success; - mmstfd = stfd; - mmhdrs.insert(mmhdrs.end(), msgs.begin(), msgs.end()); + + mmsghdr mhdr; + memset(&mhdr, 0, sizeof(mhdr)); + + mhdr.msg_hdr.msg_name = addr; + mhdr.msg_hdr.msg_namelen = addrlen; + mhdr.msg_hdr.msg_iovlen = 1; + mhdr.msg_hdr.msg_iov = new iovec(); + mhdr.msg_hdr.msg_iov->iov_base = buf; + mhdr.msg_hdr.msg_iov->iov_len = length; + mmhdrs.push_back(mhdr); if (waiting_msgs) { waiting_msgs = false; srs_cond_signal(cond); } - - return err; } void SrsRtcServer::free_messages(vector& hdrs) diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index e1bb21fff..08be09929 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -211,6 +211,9 @@ private: srs_error_t on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); srs_error_t on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); srs_error_t on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); +// Internal only. +public: + void send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length); }; class SrsRtcServer : virtual public ISrsUdpMuxHandler, virtual public ISrsHourGlass, virtual public ISrsCoroutineHandler @@ -255,7 +258,7 @@ public: virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); // Internal only. public: - srs_error_t send_and_free_messages(srs_netfd_t stfd, const std::vector& msgs); + void send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length); void free_messages(std::vector& hdrs); virtual srs_error_t cycle(); }; From c81bc367120f8644e97e178ea6877806e24de9b9 Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Thu, 9 Apr 2020 14:34:48 +0800 Subject: [PATCH 02/79] add rtc stun/dtls log --- trunk/src/app/srs_app_rtc_conn.cpp | 14 +++++++++----- trunk/src/app/srs_app_sdp.cpp | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 5305771e0..d0d1b7024 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -255,7 +255,7 @@ srs_error_t SrsDtlsSession::on_dtls(SrsUdpMuxSocket* udp_mux_skt) srs_error_t SrsDtlsSession::on_dtls_handshake_done(SrsUdpMuxSocket* udp_mux_skt) { srs_error_t err = srs_success; - srs_trace("dtls handshake done"); + srs_trace("rtc session=%s, DTLS handshake done.", rtc_session->id().c_str()); handshake_done = true; if ((err = srtp_initialize()) != srs_success) { @@ -529,6 +529,8 @@ srs_error_t SrsRtcSenderThread::cycle() SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_play(); SrsAutoFree(SrsPithyPrint, pprint); + srs_trace("rtc session=%s, start play", rtc_session->id().c_str()); + while (true) { if ((err = trd->pull()) != srs_success) { return srs_error_wrap(err, "rtc sender thread"); @@ -570,7 +572,7 @@ srs_error_t SrsRtcSenderThread::cycle() void SrsRtcSenderThread::update_sendonly_socket(SrsUdpMuxSocket* ukt) { - srs_trace("session %s address changed, update %s -> %s", + srs_trace("rtc session=%s address changed, update %s -> %s", rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), ukt->get_peer_id().c_str()); srs_freep(sendonly_ukt); @@ -746,10 +748,11 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* udp_mux_skt, SrsS send_and_free_messages(stfd, addr, addrlen, buf, stream->pos()); if (get_session_state() == WAITING_STUN) { - set_session_state(DOING_DTLS_HANDSHAKE); - peer_id = udp_mux_skt->get_peer_id(); rtc_server->insert_into_id_sessions(peer_id, this); + + set_session_state(DOING_DTLS_HANDSHAKE); + srs_trace("rtc session=%s, STUN done, waitting DTLS handshake.", id().c_str()); } return err; @@ -970,6 +973,7 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* udp_mux_skt) { srs_trace("rtc session=%s, timeout=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); + set_session_state(ESTABLISHED); return start_play(udp_mux_skt); } @@ -1333,7 +1337,7 @@ void SrsRtcServer::check_and_clean_timeout_session() // to make all logs write to the "correct" pid+cid. session->switch_to_context(); - srs_trace("rtc session=%s, stun timeout", session->id().c_str()); + srs_trace("rtc session=%s, STUN timeout", session->id().c_str()); map_username_session.erase(iter++); map_id_session.erase(session->get_peer_id()); delete session; diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index f5f4ee47f..ab080d4fd 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -361,6 +361,8 @@ srs_error_t SrsMediaDesc::encode(std::ostringstream& os) << iter->ip_ << " " << iter->port_ << " typ " << iter->type_ << " generation 0" << kCRLF; + + srs_trace("local SDP candidate line=%s", os.str().c_str()); } return err; @@ -641,7 +643,7 @@ srs_error_t SrsSdp::parse(const std::string& sdp_str) std::istringstream is(sdp_str); std::string line; while (getline(is, line)) { - srs_trace("%s", line.c_str()); + srs_verbose("%s", line.c_str()); if (line.size() < 2 || line[1] != '=') { return srs_error_new(ERROR_RTC_SDP_DECODE, "invalid sdp line=%s", line.c_str()); } From 54a887a3d91a98a809c5cac987e1ebc8fcd6368e Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Mon, 13 Apr 2020 14:43:12 +0800 Subject: [PATCH 03/79] solve merge conflict --- trunk/src/app/srs_app_rtc_conn.cpp | 161 ----------------------------- trunk/src/app/srs_app_rtc_conn.hpp | 17 --- 2 files changed, 178 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index d11d455ec..6e1d1a524 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -205,22 +205,10 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) } } -<<<<<<< HEAD - if (out_bio_len) { - srs_netfd_t stfd = udp_mux_skt->stfd(); - sockaddr_in* addr = udp_mux_skt->peer_addr(); - socklen_t addrlen = udp_mux_skt->peer_addrlen(); - - char* buf = new char[out_bio_len]; - memcpy(buf, out_bio_data, out_bio_len); - - rtc_session->send_and_free_messages(stfd, addr, addrlen, buf, out_bio_len); -======= if (out_bio_len) { if ((err = skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { return srs_error_wrap(err, "send dtls packet"); } ->>>>>>> upstream/feature/rtc } return err; @@ -607,17 +595,10 @@ srs_error_t SrsRtcSenderThread::cycle() srs_warn("send err %s", srs_error_summary(err).c_str()); srs_error_reset(err); } -<<<<<<< HEAD -void SrsRtcSenderThread::update_sendonly_socket(SrsUdpMuxSocket* ukt) -{ - srs_trace("rtc session=%s address changed, update %s -> %s", - rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), ukt->get_peer_id().c_str()); -======= for (int i = 0; i < msg_count; i++) { SrsSharedPtrMessage* msg = msgs.msgs[i]; srs_freep(msg); } ->>>>>>> upstream/feature/rtc pprint->elapse(); if (pprint->can_print()) { @@ -633,18 +614,12 @@ srs_error_t SrsRtcSenderThread::send_messages( ) { srs_error_t err = srs_success; -<<<<<<< HEAD - srs_netfd_t stfd = udp_mux_skt->stfd(); - sockaddr_in* addr = udp_mux_skt->peer_addr(); - socklen_t addrlen = udp_mux_skt->peer_addrlen(); -======= if (!rtc_session->dtls_session) { return err; } // Covert kernel messages to RTP packets. vector packets; ->>>>>>> upstream/feature/rtc for (int i = 0; i < nb_msgs; i++) { SrsSharedPtrMessage* msg = msgs[i]; @@ -704,14 +679,10 @@ srs_error_t SrsRtcSenderThread::send_messages( *pnn_rtp_pkts += (int)packets.size(); -<<<<<<< HEAD - rtc_session->send_and_free_messages(stfd, addr, addrlen, buf, length); -======= for (int j = 0; j < (int)packets.size(); j++) { SrsRtpPacket2* packet = packets[j]; if ((err = send_packet(packet, skt)) != srs_success) { srs_warn("send err %s", srs_error_summary(err).c_str()); srs_error_reset(err); ->>>>>>> upstream/feature/rtc } srs_freep(packet); } @@ -731,8 +702,6 @@ srs_error_t SrsRtcSenderThread::send_packet(SrsRtpPacket2* pkt, SrsUdpMuxSocket* if ((err = sender->fetch(&mhdr)) != srs_success) { return srs_error_wrap(err, "fetch msghdr"); } -<<<<<<< HEAD -======= char* buf = (char*)mhdr->msg_hdr.msg_iov->iov_base; // Length of iov, default size. @@ -901,7 +870,6 @@ srs_error_t SrsRtcSenderThread::packet_stap_a(SrsSource* source, SrsSharedPtrMes *ppacket = packet; return err; ->>>>>>> upstream/feature/rtc } SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id) @@ -1003,12 +971,9 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke } SrsStunPacket stun_binding_response; -<<<<<<< HEAD -======= char buf[kRtpPacketSize]; SrsBuffer* stream = new SrsBuffer(buf, sizeof(buf)); SrsAutoFree(SrsBuffer, stream); ->>>>>>> upstream/feature/rtc stun_binding_response.set_message_type(BindingResponse); stun_binding_response.set_local_ufrag(stun_req->get_remote_ufrag()); @@ -1018,23 +983,10 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke stun_binding_response.set_mapped_address(be32toh(inet_addr(skt->get_peer_ip().c_str()))); stun_binding_response.set_mapped_port(skt->get_peer_port()); - char* buf = new char[1460]; - SrsBuffer* stream = new SrsBuffer(buf, 1460); - SrsAutoFree(SrsBuffer, stream); - if ((err = stun_binding_response.encode(get_local_sdp()->get_ice_pwd(), stream)) != srs_success) { return srs_error_wrap(err, "stun binding response encode failed"); } -<<<<<<< HEAD - srs_netfd_t stfd = udp_mux_skt->stfd(); - sockaddr_in* addr = udp_mux_skt->peer_addr(); - socklen_t addrlen = udp_mux_skt->peer_addrlen(); - send_and_free_messages(stfd, addr, addrlen, buf, stream->pos()); - - if (get_session_state() == WAITING_STUN) { - peer_id = udp_mux_skt->get_peer_id(); -======= if ((err = skt->sendto(stream->data(), stream->pos(), 0)) != srs_success) { return srs_error_wrap(err, "stun binding response send failed"); } @@ -1043,7 +995,6 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke set_session_state(DOING_DTLS_HANDSHAKE); peer_id = skt->get_peer_id(); ->>>>>>> upstream/feature/rtc rtc_server->insert_into_id_sessions(peer_id, this); set_session_state(DOING_DTLS_HANDSHAKE); @@ -1138,15 +1089,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock srs_verbose("resend pkt sequence=%u", resend_pkts[i]->rtp_header.get_sequence()); dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); -<<<<<<< HEAD - - srs_netfd_t stfd = udp_mux_skt->stfd(); - sockaddr_in* addr = udp_mux_skt->peer_addr(); - socklen_t addrlen = udp_mux_skt->peer_addrlen(); - send_and_free_messages(stfd, addr, addrlen, protected_buf, nb_protected_buf); -======= skt->sendto(protected_buf, nb_protected_buf, 0); ->>>>>>> upstream/feature/rtc } } @@ -1271,14 +1214,8 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) { -<<<<<<< HEAD - srs_trace("rtc session=%s, timeout=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); - set_session_state(ESTABLISHED); - return start_play(udp_mux_skt); -======= srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); return start_play(skt); ->>>>>>> upstream/feature/rtc } srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) @@ -1394,16 +1331,7 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) return err; } -<<<<<<< HEAD -void SrsRtcSession::send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length) -{ - rtc_server->send_and_free_messages(stfd, addr, addrlen, buf, length); -} - -SrsRtcServer::SrsRtcServer() -======= SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) ->>>>>>> upstream/feature/rtc { lfd = NULL; server = s; @@ -1855,95 +1783,6 @@ srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tic return srs_success; } -<<<<<<< HEAD -void SrsRtcServer::send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length) -{ - mmstfd = stfd; - - mmsghdr mhdr; - memset(&mhdr, 0, sizeof(mhdr)); - - mhdr.msg_hdr.msg_name = addr; - mhdr.msg_hdr.msg_namelen = addrlen; - mhdr.msg_hdr.msg_iovlen = 1; - mhdr.msg_hdr.msg_iov = new iovec(); - mhdr.msg_hdr.msg_iov->iov_base = buf; - mhdr.msg_hdr.msg_iov->iov_len = length; - mmhdrs.push_back(mhdr); - - if (waiting_msgs) { - waiting_msgs = false; - srs_cond_signal(cond); - } -} - -void SrsRtcServer::free_messages(vector& hdrs) -{ - for (int i = 0; i < (int)hdrs.size(); i++) { - msghdr* hdr = &hdrs[i].msg_hdr; - for (int j = (int)hdr->msg_iovlen - 1; j >= 0 ; j--) { - iovec* iov = hdr->msg_iov + j; - char* data = (char*)iov->iov_base; - srs_freep(data); - srs_freep(iov); - } - } -} - -srs_error_t SrsRtcServer::cycle() -{ - srs_error_t err = srs_success; - - // TODO: FIXME: Use pithy print. - uint32_t cnt = 1; - - SrsStatistic* stat = SrsStatistic::instance(); - - // TODO: FIXME: Support reload. - int max_sendmmsg = _srs_config->get_rtc_server_sendmmsg(); - - while (true) { - if ((err = trd->pull()) != srs_success) { - return err; - } - - // TODO: FIXME: Use cond trigger. - if (mmhdrs.empty()) { - waiting_msgs = true; - srs_cond_wait(cond); - } - - vector mhdrs; - mmhdrs.swap(mhdrs); - - mmsghdr* p = &mhdrs[0]; - for (mmsghdr* end = p + mhdrs.size(); p < end; p += max_sendmmsg) { - int vlen = (int)(end - p); - vlen = srs_min(max_sendmmsg, vlen); - - int r0 = srs_sendmmsg(mmstfd, p, (unsigned int)vlen, 0, SRS_UTIME_NO_TIMEOUT); - if (r0 != vlen) { - srs_warn("sendmsg %d msgs, %d done", vlen, r0); - } - - stat->perf_mw_on_packets(vlen); - } - - // TODO: FIXME: Use pithy print. - if ((cnt++ % 100) == 0) { - // TODO: FIXME: Support reload. - max_sendmmsg = _srs_config->get_rtc_server_sendmmsg(); - srs_trace("-> RTC SEND %d msgs, by sendmmsg %d", mhdrs.size(), max_sendmmsg); - } - - free_messages(mhdrs); - } - - return err; -} - -======= ->>>>>>> upstream/feature/rtc RtcServerAdapter::RtcServerAdapter() { rtc = new SrsRtcServer(); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index a244c0070..3fef015c6 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -224,18 +224,9 @@ private: private: srs_error_t on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); private: -<<<<<<< HEAD - srs_error_t on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); - srs_error_t on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); - srs_error_t on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* udp_mux_skt); -// Internal only. -public: - void send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length); -======= srs_error_t on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); ->>>>>>> upstream/feature/rtc }; class SrsUdpMuxSender : virtual public ISrsUdpSender, virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler @@ -306,14 +297,6 @@ private: // interface ISrsHourGlass public: virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); -<<<<<<< HEAD -// Internal only. -public: - void send_and_free_messages(srs_netfd_t stfd, sockaddr_in* addr, socklen_t addrlen, char* buf, int length); - void free_messages(std::vector& hdrs); - virtual srs_error_t cycle(); -======= ->>>>>>> upstream/feature/rtc }; // The RTC server adapter. From ee812290c72b5f391e1c2444c66a21d835988ab5 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 22 Apr 2020 17:38:19 +0800 Subject: [PATCH 04/79] Update usage in README for RTC and GB28181 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 270a7569a..6f3e07ae3 100755 --- a/README.md +++ b/README.md @@ -55,6 +55,9 @@ docker run -p 1935:1935 -p 1985:1985 -p 8080:8080 \ * Usage: How to delivery HTTP-FLV?([CN][v3_CN_SampleHttpFlv], [EN][v3_EN_SampleHttpFlv]) * Usage: How to delivery HTTP-FLV Cluster?([CN][v3_CN_SampleHttpFlvCluster], [EN][v3_EN_SampleHttpFlvCluster]) * Usage: How to delivery HLS?([CN][v3_CN_SampleHLS], [EN][v3_EN_SampleHLS]) +* Usage: How to publish GB28181 to SRS? [#1500](https://github.com/ossrs/srs/issues/1500#issuecomment-606695679) +* Usage: How to play WebRTC from SRS? [#307](https://github.com/ossrs/srs/issues/307#issuecomment-602193458) +* Usage: How to publish SRT(Experimental) to SRS?([CN][v4_CN_SampleSRT], [EN][v4_EN_SampleSRT]) * Usage: How to transcode to h.264+aac for HLS?([CN][v3_CN_SampleTranscode2HLS], [EN][v3_EN_SampleTranscode2HLS]) * Usage: How to transode stream by FFMPEG?([CN][v2_CN_SampleFFMPEG], [EN][v2_EN_SampleFFMPEG]) * Usage: How to forward stream to other servers?([CN][v3_CN_SampleForward], [EN][v3_EN_SampleForward]) @@ -62,7 +65,6 @@ docker run -p 1935:1935 -p 1985:1985 -p 8080:8080 \ * Usage: How to ingest file/stream/device to SRS?([CN][v1_CN_SampleIngest], [EN][v1_EN_SampleIngest]) * Usage: How to delivery HLS by SRS HTTP server?([CN][v3_CN_SampleHTTP], [EN][v3_EN_SampleHTTP]) * Usage: How to delivery DASH(Experimental)?([CN][v3_CN_SampleDASH], [EN][v3_EN_SampleDASH]) -* Usage: How to transmux SRT(Experimental) to live streaming?([CN][v4_CN_SampleSRT], [EN][v4_EN_SampleSRT]) * Usage: How to publish h.264 raw stream as RTMP? ([CN][v3_CN_SrsLibrtmp2], [EN][v3_EN_SrsLibrtmp2]) * Usage: How to enable multiple processes? ([CN][v3_CN_REUSEPORT], [EN][v3_EN_REUSEPORT]) * Usage: Why SRS? What's the milestones? ([CN][v1_CN_Product], [EN][v1_EN_Product]) From a061d5c3db1bf1466e07fba4d52f1016ed3dae3f Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Thu, 23 Apr 2020 17:08:21 +0800 Subject: [PATCH 05/79] rtc publish, with debug code --- trunk/configure | 2 +- trunk/src/app/srs_app_http_api.cpp | 298 ++++++++++++ trunk/src/app/srs_app_http_api.hpp | 17 + trunk/src/app/srs_app_rtc.cpp | 74 +++ trunk/src/app/srs_app_rtc.hpp | 9 + trunk/src/app/srs_app_rtc_conn.cpp | 705 +++++++++++++++++++++++++++- trunk/src/app/srs_app_rtc_conn.hpp | 53 +++ trunk/src/app/srs_app_rtp_queue.cpp | 390 +++++++++++++++ trunk/src/app/srs_app_rtp_queue.hpp | 157 +++++++ trunk/src/kernel/srs_kernel_rtp.cpp | 177 ++++++- trunk/src/kernel/srs_kernel_rtp.hpp | 55 ++- 11 files changed, 1914 insertions(+), 23 deletions(-) create mode 100644 trunk/src/app/srs_app_rtp_queue.cpp create mode 100644 trunk/src/app/srs_app_rtp_queue.hpp diff --git a/trunk/configure b/trunk/configure index ed76da4d5..974a9163b 100755 --- a/trunk/configure +++ b/trunk/configure @@ -279,7 +279,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr" "srs_app_coworkers" "srs_app_hybrid") if [[ $SRS_RTC == YES ]]; then - MODULE_FILES+=("srs_app_rtc" "srs_app_rtc_conn" "srs_app_dtls" "srs_app_audio_recode" "srs_app_sdp") + MODULE_FILES+=("srs_app_rtc" "srs_app_rtc_conn" "srs_app_dtls" "srs_app_audio_recode" "srs_app_sdp" "srs_app_rtp_queue") fi if [[ $SRS_GB28181 == YES ]]; then MODULE_FILES+=("srs_app_gb28181" "srs_app_gb28181_sip") diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 071a0b8b5..388420374 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1068,6 +1068,11 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_media_desc.session_info_.setup_ = "active"; } else if (remote_media_desc.session_info_.setup_ == "actpass") { local_media_desc.session_info_.setup_ = "passive"; + } else { + // @see: https://tools.ietf.org/html/rfc4145#section-4.1 + // The default value of the setup attribute in an offer/answer exchange + // is 'active' in the offer and 'passive' in the answer. + local_media_desc.session_info_.setup_ = "passive"; } if (remote_media_desc.sendonly_) { @@ -1091,6 +1096,299 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str return err; } +uint32_t SrsGoApiRtcPublish::ssrc_num = 0; + +SrsGoApiRtcPublish::SrsGoApiRtcPublish(SrsRtcServer* rtc_svr) +{ + rtc_server = rtc_svr; +} + +SrsGoApiRtcPublish::~SrsGoApiRtcPublish() +{ +} + + +// Request: +// POST /rtc/v1/publish/ +// { +// "sdp":"offer...", "streamurl":"webrtc://r.ossrs.net/live/livestream", +// "api":'http...", "clientip":"..." +// } +// Response: +// {"sdp":"answer...", "sid":"..."} +// @see https://github.com/rtcdn/rtcdn-draft +srs_error_t SrsGoApiRtcPublish::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r) +{ + srs_error_t err = srs_success; + + SrsJsonObject* res = SrsJsonAny::object(); + SrsAutoFree(SrsJsonObject, res); + + if ((err = do_serve_http(w, r, res)) != srs_success) { + srs_warn("RTC error %s", srs_error_desc(err).c_str()); srs_freep(err); + return srs_api_response_code(w, r, SRS_CONSTS_HTTP_BadRequest); + } + + return srs_api_response(w, r, res->dumps()); +} + +srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, SrsJsonObject* res) +{ + srs_error_t err = srs_success; + + // For each RTC session, we use short-term HTTP connection. + SrsHttpHeader* hdr = w->header(); + hdr->set("Connection", "Close"); + + // Parse req, the request json object, from body. + SrsJsonObject* req = NULL; + if (true) { + string req_json; + if ((err = r->body_read_all(req_json)) != srs_success) { + return srs_error_wrap(err, "read body"); + } + + SrsJsonAny* json = SrsJsonAny::loads(req_json); + if (!json || !json->is_object()) { + return srs_error_wrap(err, "not json"); + } + + req = json->to_object(); + } + + // Fetch params from req object. + SrsJsonAny* prop = NULL; + if ((prop = req->ensure_property_string("sdp")) == NULL) { + return srs_error_wrap(err, "not sdp"); + } + string remote_sdp_str = prop->to_str(); + + if ((prop = req->ensure_property_string("streamurl")) == NULL) { + return srs_error_wrap(err, "not streamurl"); + } + string streamurl = prop->to_str(); + + string clientip; + if ((prop = req->ensure_property_string("clientip")) != NULL) { + clientip = prop->to_str(); + } + + string api; + if ((prop = req->ensure_property_string("api")) != NULL) { + api = prop->to_str(); + } + + // Parse app and stream from streamurl. + string app; + string stream_name; + if (true) { + string tcUrl; + srs_parse_rtmp_url(streamurl, tcUrl, stream_name); + + int port; + string schema, host, vhost, param; + srs_discovery_tc_url(tcUrl, schema, host, vhost, app, stream_name, port, param); + } + + srs_trace("RTC publish %s, api=%s, clientip=%s, app=%s, stream=%s, offer=%dB", + streamurl.c_str(), api.c_str(), clientip.c_str(), app.c_str(), stream_name.c_str(), remote_sdp_str.length()); + + // TODO: FIXME: It seems remote_sdp doesn't represents the full SDP information. + SrsSdp remote_sdp; + if ((err = remote_sdp.parse(remote_sdp_str)) != srs_success) { + return srs_error_wrap(err, "parse sdp failed: %s", remote_sdp_str.c_str()); + } + + if ((err = check_remote_sdp(remote_sdp)) != srs_success) { + return srs_error_wrap(err, "remote sdp check failed"); + } + + SrsSdp local_sdp; + if ((err = exchange_sdp(app, stream_name, remote_sdp, local_sdp)) != srs_success) { + return srs_error_wrap(err, "remote sdp have error or unsupport attributes"); + } + + SrsRequest request; + request.app = app; + request.stream = stream_name; + + // TODO: FIXME: Maybe need a better name? + // TODO: FIXME: When server enabled, but vhost disabled, should report error. + SrsRtcSession* rtc_session = rtc_server->create_rtc_session(request, remote_sdp, local_sdp, ""); + + ostringstream os; + if ((err = local_sdp.encode(os)) != srs_success) { + return srs_error_wrap(err, "encode sdp"); + } + + string local_sdp_str = os.str(); + + srs_trace("local_sdp=%s", local_sdp_str.c_str()); + + res->set("code", SrsJsonAny::integer(ERROR_SUCCESS)); + res->set("server", SrsJsonAny::integer(SrsStatistic::instance()->server_id())); + + // TODO: add candidates in response json? + + res->set("sdp", SrsJsonAny::str(local_sdp_str.c_str())); + res->set("sessionid", SrsJsonAny::str(rtc_session->id().c_str())); + + srs_trace("RTC sid=%s, offer=%dB, answer=%dB", rtc_session->id().c_str(), remote_sdp_str.length(), local_sdp_str.length()); + + return err; +} + +srs_error_t SrsGoApiRtcPublish::check_remote_sdp(const SrsSdp& remote_sdp) +{ + srs_error_t err = srs_success; + + if (remote_sdp.group_policy_ != "BUNDLE") { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "now only support BUNDLE, group policy=%s", remote_sdp.group_policy_.c_str()); + } + + if (remote_sdp.media_descs_.empty()) { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no media descriptions"); + } + + for (std::vector::const_iterator iter = remote_sdp.media_descs_.begin(); iter != remote_sdp.media_descs_.end(); ++iter) { + if (iter->type_ != "audio" && iter->type_ != "video") { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "unsupport media type=%s", iter->type_.c_str()); + } + + if (! iter->rtcp_mux_) { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "now only suppor rtcp-mux"); + } + + for (std::vector::const_iterator iter_media = iter->payload_types_.begin(); iter_media != iter->payload_types_.end(); ++iter_media) { + if (iter->recvonly_) { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "publish API only support sendrecv/sendonly"); + } + } + } + + return err; +} + +srs_error_t SrsGoApiRtcPublish::exchange_sdp(const std::string& app, const std::string& stream, const SrsSdp& remote_sdp, SrsSdp& local_sdp) +{ + srs_error_t err = srs_success; + local_sdp.version_ = "0"; + + local_sdp.username_ = RTMP_SIG_SRS_SERVER; + local_sdp.session_id_ = srs_int2str((int64_t)this); + local_sdp.session_version_ = "2"; + local_sdp.nettype_ = "IN"; + local_sdp.addrtype_ = "IP4"; + local_sdp.unicast_address_ = "0.0.0.0"; + + local_sdp.session_name_ = "live_publish_session"; + + local_sdp.msid_semantic_ = "WMS"; + local_sdp.msids_.push_back(app + "/" + stream); + + local_sdp.group_policy_ = "BUNDLE"; + + int mid = 0; + + for (int i = 0; i < remote_sdp.media_descs_.size(); ++i) { + const SrsMediaDesc& remote_media_desc = remote_sdp.media_descs_[i]; + + if (remote_media_desc.is_audio()) { + local_sdp.media_descs_.push_back(SrsMediaDesc("audio")); + } else if (remote_media_desc.is_video()) { + local_sdp.media_descs_.push_back(SrsMediaDesc("video")); + } + + SrsMediaDesc& local_media_desc = local_sdp.media_descs_.back(); + + if (remote_media_desc.is_audio()) { + // TODO: check opus format specific param + std::vector payloads = remote_media_desc.find_media_with_encoding_name("opus"); + for (std::vector::iterator iter = payloads.begin(); iter != payloads.end(); ++iter) { + // Only choose one match opus codec. + local_media_desc.payload_types_.push_back(*iter); + break; + } + + if (local_media_desc.payload_types_.empty()) { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no valid found opus payload type"); + } + + } else if (remote_media_desc.is_video()) { + std::deque backup_payloads; + std::vector payloads = remote_media_desc.find_media_with_encoding_name("H264"); + for (std::vector::iterator iter = payloads.begin(); iter != payloads.end(); ++iter) { + if (iter->format_specific_param_.empty()) { + backup_payloads.push_front(*iter); + continue; + } + H264SpecificParam h264_param; + if ((err = parse_h264_fmtp(iter->format_specific_param_, h264_param)) != srs_success) { + srs_error_reset(err); continue; + } + + // Try to pick the "best match" H.264 payload type. + if (h264_param.packetization_mode == "1" && h264_param.level_asymmerty_allow == "1") { + // Only choose first match H.264 payload type. + local_media_desc.payload_types_.push_back(*iter); + break; + } + + backup_payloads.push_back(*iter); + } + + // Try my best to pick at least one media payload type. + if (local_media_desc.payload_types_.empty() && ! backup_payloads.empty()) { + srs_warn("choose backup H.264 payload type=%d", backup_payloads.front().payload_type_); + local_media_desc.payload_types_.push_back(backup_payloads.front()); + } + + if (local_media_desc.payload_types_.empty()) { + return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no found valid H.264 payload type"); + } + + local_media_desc.payload_types_.back().rtcp_fb_.push_back("rrtr"); + } + + local_media_desc.mid_ = remote_media_desc.mid_; + local_sdp.groups_.push_back(local_media_desc.mid_); + + local_media_desc.port_ = 9; + local_media_desc.protos_ = "UDP/TLS/RTP/SAVPF"; + + if (remote_media_desc.session_info_.setup_ == "active") { + local_media_desc.session_info_.setup_ = "passive"; + } else if (remote_media_desc.session_info_.setup_ == "passive") { + local_media_desc.session_info_.setup_ = "active"; + } else if (remote_media_desc.session_info_.setup_ == "actpass") { + local_media_desc.session_info_.setup_ = "passive"; + } else { + // @see: https://tools.ietf.org/html/rfc4145#section-4.1 + // The default value of the setup attribute in an offer/answer exchange + // is 'active' in the offer and 'passive' in the answer. + local_media_desc.session_info_.setup_ = "passive"; + } + + local_sdp.media_descs_.back().session_info_.ice_options_ = "trickle"; + + if (remote_media_desc.sendonly_) { + local_media_desc.recvonly_ = true; + } else if (remote_media_desc.recvonly_) { + local_media_desc.sendonly_ = true; + } else if (remote_media_desc.sendrecv_) { + local_media_desc.sendrecv_ = true; + } + + local_media_desc.rtcp_mux_ = true; + + SrsSSRCInfo ssrc_info; + ssrc_info.ssrc_ = ++ssrc_num; + ssrc_info.cname_ = "test_sdp_cname"; + local_media_desc.ssrc_infos_.push_back(ssrc_info); + } + + return err; +} #endif SrsGoApiClients::SrsGoApiClients() diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index b94dfa46c..f38e4a58f 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -184,6 +184,23 @@ private: srs_error_t exchange_sdp(const std::string& app, const std::string& stream, const SrsSdp& remote_sdp, SrsSdp& local_sdp); srs_error_t check_remote_sdp(const SrsSdp& remote_sdp); }; + +class SrsGoApiRtcPublish : public ISrsHttpHandler +{ +public: + static uint32_t ssrc_num; +private: + SrsRtcServer* rtc_server; +public: + SrsGoApiRtcPublish(SrsRtcServer* rtc_svr); + virtual ~SrsGoApiRtcPublish(); +public: + virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); +private: + virtual srs_error_t do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, SrsJsonObject* res); + srs_error_t exchange_sdp(const std::string& app, const std::string& stream, const SrsSdp& remote_sdp, SrsSdp& local_sdp); + srs_error_t check_remote_sdp(const SrsSdp& remote_sdp); +}; #endif class SrsGoApiClients : public ISrsHttpHandler diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp index 95cfea597..288f892e1 100644 --- a/trunk/src/app/srs_app_rtc.cpp +++ b/trunk/src/app/srs_app_rtc.cpp @@ -212,6 +212,80 @@ srs_error_t SrsRtpOpusMuxer::transcode(SrsSharedPtrMessage* shared_audio, char* return err; } +SrsRtpH264Demuxer::SrsRtpH264Demuxer() +{ +} + +SrsRtpH264Demuxer::~SrsRtpH264Demuxer() +{ +} + +srs_error_t SrsRtpH264Demuxer::parse(SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + + SrsRtpH264Header* rtp_h264_header = dynamic_cast(rtp_pkt->rtp_payload_header); + if (rtp_h264_header == NULL) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid rtp packet"); + } + + uint8_t* rtp_payload = reinterpret_cast(rtp_pkt->rtp_payload()); + int rtp_payload_size = rtp_pkt->rtp_payload_size(); + + if (rtp_payload_size == 0) { + srs_verbose("seq=%u, empty payload", rtp_pkt->rtp_header.get_sequence()); + return err; + } + + uint8_t nal_type = rtp_payload[0] & kNalTypeMask; + + if (nal_type >= 1 && nal_type <= 23) { + srs_verbose("seq=%u, single nalu", rtp_pkt->rtp_header.get_sequence()); + rtp_h264_header->is_first_packet_of_frame = true; + rtp_h264_header->is_last_packet_of_frame = true; + rtp_h264_header->nalu_type = nal_type; + rtp_h264_header->nalu_header = rtp_payload[0]; + rtp_h264_header->nalu_offset.push_back(make_pair(0, rtp_payload_size)); + } else if (nal_type == kFuA) { + srs_verbose("seq=%u, fu-a", rtp_pkt->rtp_header.get_sequence()); + if ((rtp_payload[1] & kStart)) { + rtp_h264_header->is_first_packet_of_frame = true; + } + if ((rtp_payload[1] & kEnd)) { + rtp_h264_header->is_last_packet_of_frame = true; + } + rtp_h264_header->nalu_type = nal_type; + rtp_h264_header->nalu_header = (rtp_payload[0] & (~kNalTypeMask)) | (rtp_payload[1] & kNalTypeMask); + rtp_h264_header->nalu_offset.push_back(make_pair(2, rtp_payload_size - 2)); + } else if (nal_type == kStapA) { + srs_verbose("seq=%u, stap-a", rtp_pkt->rtp_header.get_sequence()); + int i = 1; + rtp_h264_header->is_first_packet_of_frame = true; + rtp_h264_header->is_last_packet_of_frame = true; + rtp_h264_header->nalu_type = nal_type; + while (i < rtp_payload_size) { + srs_verbose("stap-a cur index=%s", srs_string_dumps_hex(reinterpret_cast(rtp_payload + i), 2).c_str()); + uint16_t nal_len = (rtp_payload[i]) << 8 | rtp_payload[i + 1]; + if (nal_len > rtp_payload_size - i) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid stap-a packet, nal len=%u, i=%d, rtp_payload_size=%d", nal_len, i, rtp_payload_size); + } + + rtp_h264_header->nalu_offset.push_back(make_pair(i + 2, nal_len)); + + i += nal_len + 2; + } + + if (i != rtp_payload_size) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid stap-a packet"); + } + } else { + srs_verbose("payload size=%d, payload=%s", rtp_payload_size, srs_string_dumps_hex(rtp_pkt->payload, rtp_pkt->size).c_str()); + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid h264 rtp packet"); + } + + return err; +} + SrsRtc::SrsRtc() { req = NULL; diff --git a/trunk/src/app/srs_app_rtc.hpp b/trunk/src/app/srs_app_rtc.hpp index d232ca31f..7c22e04dd 100644 --- a/trunk/src/app/srs_app_rtc.hpp +++ b/trunk/src/app/srs_app_rtc.hpp @@ -78,6 +78,15 @@ public: srs_error_t transcode(SrsSharedPtrMessage* shared_audio, char* adts_audio, int nn_adts_audio); }; +class SrsRtpH264Demuxer +{ +public: + SrsRtpH264Demuxer(); + virtual ~SrsRtpH264Demuxer(); +public: + srs_error_t parse(SrsRtpSharedPacket* rtp_pkt); +}; + class SrsRtc { private: diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 813885821..eba344f55 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -54,6 +54,7 @@ using namespace std; #include #include #include +#include #include #include #include @@ -123,6 +124,44 @@ static std::vector get_candidate_ips() return candidate_ips; } +static map ssrc_lxr; + +uint64_t SrsNtp::kMagicNtpFractionalUnit = 1ULL << 32; + +SrsNtp::SrsNtp() +{ + system_ms_ = 0; + ntp_ = 0; + ntp_second_ = 0; + ntp_fractions_ = 0; +} + +SrsNtp::~SrsNtp() +{ +} + +SrsNtp SrsNtp::from_time_ms(uint64_t ms) +{ + SrsNtp srs_ntp; + srs_ntp.system_ms_ = ms; + srs_ntp.ntp_second_ = ms / 1000; + srs_ntp.ntp_fractions_ = (static_cast(ms % 1000 / 1000.0)) * kMagicNtpFractionalUnit; + srs_ntp.ntp_ = (static_cast(srs_ntp.ntp_second_) << 32) | srs_ntp.ntp_fractions_; + return srs_ntp; +} + +SrsNtp SrsNtp::to_time_ms(uint64_t ntp) +{ + SrsNtp srs_ntp; + srs_ntp.ntp_ = ntp; + srs_ntp.ntp_second_ = (ntp & 0xFFFFFFFF00000000ULL) >> 32; + srs_ntp.ntp_fractions_ = (ntp & 0x00000000FFFFFFFFULL); + srs_ntp.system_ms_ = (static_cast(srs_ntp.ntp_second_) * 1000) + + (static_cast(static_cast(srs_ntp.ntp_fractions_) * 1000.0) / kMagicNtpFractionalUnit); + return srs_ntp; +} + + SrsDtlsSession::SrsDtlsSession(SrsRtcSession* s) { rtc_session = s; @@ -1415,6 +1454,356 @@ srs_error_t SrsRtcSenderThread::packet_stap_a(SrsSource* source, SrsSharedPtrMes return err; } +SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) +{ + rtc_session = session; + rtp_h264_demuxer = new SrsRtpH264Demuxer(); + rtp_video_queue = new SrsRtpQueue(1000); + rtp_audio_queue = new SrsRtpQueue(100, true); + + source = NULL; +} + +SrsRtcPublisher::~SrsRtcPublisher() +{ + srs_freep(rtp_h264_demuxer); + srs_freep(rtp_video_queue); + srs_freep(rtp_audio_queue); +} + +void SrsRtcPublisher::initialize(uint32_t vssrc, uint32_t assrc, SrsRequest request) +{ + video_ssrc = vssrc; + audio_ssrc = assrc; + this->request = request; + + srs_verbose("video_ssrc=%u, audio_ssrc=%u", video_ssrc, audio_ssrc); +} + +srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) +{ + srs_error_t err = srs_success; + + SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); + SrsAutoFree(SrsRtpSharedPacket, rtp_shared_pkt); + if ((err = rtp_shared_pkt->decode(buf, nb_buf)) != srs_success) { + return srs_error_wrap(err, "rtp packet decode failed"); + } + + uint32_t ssrc = rtp_shared_pkt->rtp_header.get_ssrc(); + + if (ssrc == audio_ssrc) { + return on_audio(skt, rtp_shared_pkt); + } else if (ssrc == video_ssrc) { + return on_video(skt, rtp_shared_pkt); + } + + return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); +} + +srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + return err; + + vector nack_seqs; + rtp_audio_queue->nack_.get_nack_seqs(nack_seqs); + vector::iterator iter = nack_seqs.begin(); + while (iter != nack_seqs.end()) { + char buf[1024]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x81); + stream.write_1bytes(kRtpFb); + stream.write_2bytes(3); + stream.write_4bytes(audio_ssrc); + stream.write_4bytes(audio_ssrc); + uint16_t pid = *iter; + uint16_t blp = 0; + srs_verbose("pid=%u", pid); + while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { + blp |= (1 << (*(iter + 1) - pid - 1)); + srs_verbose("blp=%u", *(iter+1)); + ++iter; + } + stream.write_2bytes(pid); + stream.write_2bytes(blp); + + srs_verbose("nack dump=%s", srs_string_dumps_hex(stream.data(), stream.pos()).c_str()); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + + if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + skt->sendto(protected_buf, nb_protected_buf, 0); + //skt->sendto(stream.data(), stream.pos(), 0); + srs_verbose("send nack req, len=%d", nb_protected_buf); + } else { + srs_verbose("send nack failed, because of protect rtcp failed"); + } + ++iter; + } + + rtp_pkt->rtp_payload_header = new SrsRtpOpusHeader(); + rtp_pkt->rtp_payload_header->is_first_packet_of_frame = true; + rtp_pkt->rtp_payload_header->is_last_packet_of_frame = true; + + rtp_audio_queue->insert(rtp_pkt); + + std::vector > frames; + rtp_audio_queue->get_and_clean_collected_frames(frames); + + for (size_t i = 0; i < frames.size(); ++i) { + if (! frames[i].empty()) { + srs_verbose("collect %d audio frames, seq range %u,%u", + frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); + } + + for (size_t n = 0; n < frames[i].size(); ++n) { + srs_freep(frames[i][n]); + } + } + + return err; +} + +srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + + vector nack_seqs; + rtp_video_queue->nack_.get_nack_seqs(nack_seqs); + vector::iterator iter = nack_seqs.begin(); + while (iter != nack_seqs.end()) { + char buf[1024]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x81); + stream.write_1bytes(kRtpFb); + stream.write_2bytes(3); + stream.write_4bytes(video_ssrc); + stream.write_4bytes(video_ssrc); + uint16_t pid = *iter; + uint16_t blp = 0; + srs_verbose("pid=%u", pid); + while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { + blp |= (1 << (*(iter + 1) - pid - 1)); + srs_verbose("blp=%u", *(iter+1)); + ++iter; + } + stream.write_2bytes(pid); + stream.write_2bytes(blp); + + srs_verbose("nack dump=%s", srs_string_dumps_hex(stream.data(), stream.pos()).c_str()); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + + if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + skt->sendto(protected_buf, nb_protected_buf, 0); + //skt->sendto(stream.data(), stream.pos(), 0); + srs_verbose("send nack req, len=%d", nb_protected_buf); + } else { + srs_verbose("send nack failed, because of protect rtcp failed"); + } + ++iter; + } + + rtp_pkt->rtp_payload_header = new SrsRtpH264Header(); + + if ((err = rtp_h264_demuxer->parse(rtp_pkt)) != srs_success) { + return srs_error_wrap(err, "rtp h264 demux failed"); + } + + rtp_video_queue->insert(rtp_pkt); + + std::vector > frames; + rtp_video_queue->get_and_clean_collected_frames(frames); + + for (size_t i = 0; i < frames.size(); ++i) { + if (! frames[i].empty()) { + srs_verbose("collect %d video frames, seq range %u,%u", frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); + } + int frame_size = 5; + vector nalu_len; + uint32_t len = 0; + for (size_t n = 0; n < frames[i].size(); ++n) { + SrsRtpH264Header* rtp_h264_header = dynamic_cast(frames[i][n]->rtp_payload_header); + for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { + if (rtp_h264_header->nalu_type != kFuA) { + uint8_t* p = reinterpret_cast(frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); + if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSPS) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypePPS)) { + frame_size += rtp_h264_header->nalu_offset[j].second + 4; + nalu_len.push_back(rtp_h264_header->nalu_offset[j].second); + } + } else { + if (frames[i][n]->rtp_payload_header->is_first_packet_of_frame) { + frame_size += 5; + len += 1; + } + frame_size += rtp_h264_header->nalu_offset[j].second; + len += rtp_h264_header->nalu_offset[j].second; + + if (frames[i][n]->rtp_payload_header->is_last_packet_of_frame) { + nalu_len.push_back(len); + len = 0; + } + } + } + } + + uint8_t* frame = new uint8_t[frame_size]; + int frame_len = 5; + + bool video_header_change = false; + int64_t timestamp = 0; + + bool idr = false; + size_t len_index = 0; + for (size_t n = 0; n < frames[i].size(); ++n) { + SrsRtpH264Header* rtp_h264_header = dynamic_cast(frames[i][n]->rtp_payload_header); + for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { + timestamp = frames[i][n]->rtp_header.get_timestamp(); + + uint8_t* p = reinterpret_cast(frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); + srs_verbose("nalu_type=%u, %02X", rtp_h264_header->nalu_type, p[0]); + if (rtp_h264_header->nalu_type != kFuA) { + if ((p[0] & kNalTypeMask) == SrsAvcNaluTypeSPS) { + srs_verbose("sps"); + string cur_sps = string((char*)p, rtp_h264_header->nalu_offset[j].second); + if (! cur_sps.empty() && sps != cur_sps) { + video_header_change = true; + sps = cur_sps; + } + } else if ((p[0] & kNalTypeMask) == SrsAvcNaluTypePPS) { + srs_verbose("pps"); + string cur_pps = string((char*)p, rtp_h264_header->nalu_offset[j].second); + if (! cur_pps.empty() && pps != cur_pps) { + video_header_change = true; + pps = cur_pps; + } + } else if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI)) { + uint32_t len = nalu_len[len_index++]; + srs_verbose("nalu len=%u", len); + SrsBuffer stream((char*)frame + frame_len, 4); + stream.write_4bytes(len); + frame_len += 4; + memcpy(frame + frame_len, p, rtp_h264_header->nalu_offset[j].second); + frame_len += rtp_h264_header->nalu_offset[j].second; + } + } else { + if (frames[i][n]->rtp_payload_header->is_first_packet_of_frame) { + uint32_t len = nalu_len[len_index++]; + srs_verbose("nalu len=%u", len); + SrsBuffer stream((char*)frame + frame_len, 4); + stream.write_4bytes(len); + frame_len += 4; + frame[frame_len++] = rtp_h264_header->nalu_header; + + if ((rtp_h264_header->nalu_header & kNalTypeMask) == SrsAvcNaluTypeIDR) { + srs_verbose("idr"); + idr = true; + } + } + memcpy(frame + frame_len, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, + rtp_h264_header->nalu_offset[j].second); + frame_len += rtp_h264_header->nalu_offset[j].second; + } + } + srs_freep(frames[i][n]); + } + + if (video_header_change) { + srs_verbose("sps/pps change or init"); + if (source == NULL) { + // TODO: FIXME: Should refactor it, directly use http server as handler. + ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); + if ((err = _srs_sources->fetch_or_create(&request, handler, &source)) != srs_success) { + return srs_error_wrap(err, "create source"); + } + + source->on_publish(); + } + + uint8_t* video_header = new uint8_t[1500]; + SrsBuffer *stream = new SrsBuffer((char*)video_header, 1500); + SrsAutoFree(SrsBuffer, stream); + stream->write_1bytes(0x17); + stream->write_1bytes(0x00); + stream->write_1bytes(0x00); + stream->write_1bytes(0x00); + stream->write_1bytes(0x00); + + // NAL SIZE 61 76 63 43 01 42 C0 1E FF E1 SPS_LEN SPS 01 PPS_LEN PPS + stream->write_1bytes(0x01); + stream->write_1bytes(0x42); + stream->write_1bytes(0xC0); + stream->write_1bytes(0x1E); + stream->write_1bytes(0xFF); + stream->write_1bytes(0xE1); + + stream->write_2bytes(sps.size()); + stream->write_string(sps); + + stream->write_1bytes(0x01); + + stream->write_2bytes(pps.size()); + stream->write_string(pps); + + SrsMessageHeader header; + header.message_type = 9; + header.timestamp = timestamp / 90; + SrsCommonMessage* shared_video = new SrsCommonMessage(); + SrsAutoFree(SrsCommonMessage, shared_video); + shared_video->create(&header, reinterpret_cast(video_header), stream->pos()); + srs_error_t e = source->on_video(shared_video); + if (e != srs_success) { + srs_warn("on video header err=%s", srs_error_desc(e).c_str()); + } + + srs_verbose("rtp on video header"); + } + + if (! sps.empty() && ! pps.empty()) { + if (source == NULL) { + // TODO: FIXME: Should refactor it, directly use http server as handler. + ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); + if ((err = _srs_sources->fetch_or_create(&request, handler, &source)) != srs_success) { + return srs_error_wrap(err, "create source"); + } + source->on_publish(); + } + + if (idr) { + frame[0] = 0x17; + } else { + frame[0] = 0x27; + } + frame[1] = 0x01; + frame[2] = 0x00; + frame[3] = 0x00; + frame[4] = 0x00; + + SrsMessageHeader header; + header.message_type = 9; + header.timestamp = timestamp / 90; + SrsCommonMessage* shared_video = new SrsCommonMessage(); + SrsAutoFree(SrsCommonMessage, shared_video); + shared_video->create(&header, reinterpret_cast(frame), frame_len); + srs_error_t e = source->on_video(shared_video); + if (e != srs_success) { + srs_warn("on video err=%s", srs_error_desc(e).c_str()); + } + + srs_verbose("rtp on video"); + } + } + + return err; +} + + SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id) { rtc_server = rtc_svr; @@ -1435,6 +1824,8 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const // TODO: FIXME: Support reload. sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req.vhost); + + rtc_publisher = new SrsRtcPublisher(this); } SrsRtcSession::~SrsRtcSession() @@ -1686,6 +2077,263 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxS return err; } +srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|reserved | PT=XR=207 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + : report blocks : + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + + SrsBuffer stream(buf, nb_buf); + uint8_t first = stream.read_1bytes(); + uint8_t pt = stream.read_1bytes(); + uint16_t length = (stream.read_2bytes() + 1) * 4; + uint32_t ssrc = stream.read_4bytes(); + + if (length != nb_buf) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet, length=%u, nb_buf=%d", length, nb_buf); + } + + while (stream.pos() + 4 < length) { + uint8_t bt = stream.read_1bytes(); + stream.skip(1); + uint16_t block_length = (stream.read_2bytes() + 1) * 4; + srs_verbose("XR, bt=%u", bt); + + if (stream.pos() + block_length - 4 > nb_buf) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet block, block_length=%u, nb_buf=%d", block_length, nb_buf); + } + + if (bt == 5) { + for (int i = 4; i < block_length; i += 12) { + uint32_t ssrc = stream.read_4bytes(); + uint32_t lrr = stream.read_4bytes(); + uint32_t dlrr = stream.read_4bytes(); + + SrsNtp cur_ntp = SrsNtp::from_time_ms(srs_update_system_time()/1000); + uint32_t compact_ntp = (cur_ntp.ntp_second_ << 16) | (cur_ntp.ntp_fractions_ >> 16); + + int rtt_ntp = compact_ntp - lrr - dlrr; + int rtt = ((rtt_ntp * 1000) >> 16) + ((rtt_ntp >> 16) * 1000); + /* + lsr = (srs_ntp.ntp_second_ << 16) | (srs_ntp.ntp_fractions_ >> 16); + uint32_t dlsr = (srs_update_system_time() - ssrc_lsr[ssrc_of_sender]) / 1000; + rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); + */ + srs_verbose("ssrc=%u, compact_ntp=%u, lrr=%u, dlrr=%u, rtt=%d", + ssrc, compact_ntp, lrr, dlrr, rtt); + + if (ssrc == rtc_publisher->video_ssrc) { + rtc_publisher->rtp_video_queue->update_rtt(rtt); + } else if (ssrc == rtc_publisher->audio_ssrc) { + rtc_publisher->rtp_audio_queue->update_rtt(rtt); + } + } + } + } + + return err; +} + +srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + + if (nb_buf < 28) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtp sender report packet, nb_buf=%d", nb_buf); + } + + SrsBuffer* stream = new SrsBuffer(buf, nb_buf); + SrsAutoFree(SrsBuffer, stream); + + srs_verbose("SS=%s", srs_string_dumps_hex(buf, nb_buf).c_str()); + + // @see: https://tools.ietf.org/html/rfc3550#section-6.4.1 + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +header |V=2|P| RC | PT=SR=200 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC of sender | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +sender | NTP timestamp, most significant word | +info +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, least significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | RTP timestamp | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sender's packet count | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sender's octet count | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +report | SSRC_1 (SSRC of first source) | +block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 1 | fraction lost | cumulative number of packets lost | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | extended highest sequence number received | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | interarrival jitter | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | last SR (LSR) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | delay since last SR (DLSR) | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +report | SSRC_2 (SSRC of second source) | +block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 2 : ... : + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + | profile-specific extensions | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + uint8_t first = stream->read_1bytes(); + //uint8_t version = first & 0xC0; + //uint8_t padding = first & 0x20; + uint8_t rc = first & 0x1F; + + /*uint8_t payload_type = */stream->read_1bytes(); + uint16_t length = stream->read_2bytes(); + + if (((length + 1) * 4) != (rc * 24 + 28)) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtcp sender report packet, length=%u, rc=%u", length, rc); + } + + uint32_t ssrc_of_sender = stream->read_4bytes(); + uint64_t ntp = stream->read_8bytes(); + SrsNtp srs_ntp = SrsNtp::to_time_ms(ntp); + uint32_t rtp_time = stream->read_4bytes(); + uint32_t sender_packet_count = stream->read_4bytes(); + uint32_t sender_octec_count = stream->read_4bytes(); + + SrsNtp cur_ntp = SrsNtp::from_time_ms(srs_update_system_time()/1000); + + srs_verbose("sender report, ssrc_of_sender=%u, ntp={%lu,%lu}, cur_ntp={%lu,%lu},rtp_time=%u, sender_packet_count=%u, sender_octec_count=%u", + ssrc_of_sender, srs_ntp.ntp_, srs_ntp.system_ms_, cur_ntp.ntp_, cur_ntp.system_ms_, rtp_time, sender_packet_count, sender_octec_count); + + for (int i = 0; i < rc; ++i) { + uint32_t ssrc = stream->read_4bytes(); + uint8_t fraction_lost = stream->read_1bytes(); + uint32_t cumulative_number_of_packets_lost = stream->read_3bytes(); + uint32_t highest_seq = stream->read_4bytes(); + uint32_t jitter = stream->read_4bytes(); + uint32_t lst = stream->read_4bytes(); + uint32_t dlsr = stream->read_4bytes(); + + (void)ssrc; (void)fraction_lost; (void)cumulative_number_of_packets_lost; (void)highest_seq; (void)jitter; (void)lst; (void)dlsr; + srs_verbose("sender report, ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, highest_seq=%u, jitter=%u, lst=%u, dlst=%u", + ssrc, fraction_lost, cumulative_number_of_packets_lost, highest_seq, jitter, lst, dlsr); + } + + static map ssrc_lsr; + + // Response RR + { + char buf[1024]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x81); + stream.write_1bytes(kRR); + stream.write_2bytes(7); + stream.write_4bytes(ssrc_of_sender); + + SrsRtpQueue* rtp_queue = NULL; + string type = "unknown"; + if (ssrc_of_sender == rtc_publisher->video_ssrc) { + rtp_queue = rtc_publisher->rtp_video_queue; + type = "video"; + } else if (ssrc_of_sender == rtc_publisher->audio_ssrc) { + rtp_queue = rtc_publisher->rtp_audio_queue; + type = "audio"; + } + + uint8_t fraction_lost = rtp_queue->get_fraction_lost(); + uint32_t cumulative_number_of_packets_lost = rtp_queue->get_cumulative_number_of_packets_lost() & 0x7FFFFF; + uint32_t extended_highest_sequence = rtp_queue->get_extended_highest_sequence(); + uint32_t interarrival_jitter = rtp_queue->get_interarrival_jitter(); + + uint32_t lsr = 0; + uint32_t rr_dlsr = 0; + if (ssrc_lsr[ssrc_of_sender] > 0) { + lsr = (srs_ntp.ntp_second_ << 16) | (srs_ntp.ntp_fractions_ >> 16); + uint32_t dlsr = (srs_update_system_time() - ssrc_lsr[ssrc_of_sender]) / 1000; + rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); + } + + + stream.write_4bytes(ssrc_of_sender); + stream.write_1bytes(fraction_lost); + stream.write_3bytes(cumulative_number_of_packets_lost); + stream.write_4bytes(extended_highest_sequence); + stream.write_4bytes(interarrival_jitter); + stream.write_4bytes(lsr); + stream.write_4bytes(rr_dlsr); + + srs_verbose("RR type=%s, ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, extended_highest_sequence=%u, interarrival_jitter=%u", + type.c_str(), ssrc_of_sender, fraction_lost, cumulative_number_of_packets_lost, extended_highest_sequence, interarrival_jitter); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + if (dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + skt->sendto(protected_buf, nb_protected_buf, 0); + } + + // XR + { + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|reserved | PT=XR=207 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + : report blocks : + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | BT=4 | reserved | block length = 2 | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, most significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, least significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + char buf[1024]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x80); + stream.write_1bytes(kXR); + stream.write_2bytes(4); + stream.write_4bytes(ssrc_of_sender); + stream.write_1bytes(4); + stream.write_1bytes(0); + stream.write_2bytes(2); + stream.write_4bytes(cur_ntp.ntp_second_); + stream.write_4bytes(cur_ntp.ntp_fractions_); + ssrc_lxr[ssrc_of_sender] = srs_ntp.system_ms_; + //skt->sendto(stream.data(), stream.pos(), 0); + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + if (dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + skt->sendto(protected_buf, nb_protected_buf, 0); + } + } + } + + ssrc_lsr[ssrc_of_sender] = srs_update_system_time(); + + return err; +} + srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; @@ -1757,6 +2405,31 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) { + // FIXME: + if (true) + { + uint32_t video_ssrc = 0; + uint32_t audio_ssrc = 0; + uint16_t video_payload_type = 0; + uint16_t audio_payload_type = 0; + for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { + const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; + if (media_desc.is_audio()) { + if (! media_desc.ssrc_infos_.empty()) { + audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; + audio_payload_type = media_desc.payload_types_[0].payload_type_; + } + } else if (media_desc.is_video()) { + if (! media_desc.ssrc_infos_.empty()) { + video_ssrc = media_desc.ssrc_infos_[0].ssrc_; + video_payload_type = media_desc.payload_types_[0].payload_type_; + } + } + } + + rtc_publisher->initialize(video_ssrc, audio_ssrc, request); + } + srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); return start_play(skt); } @@ -1834,6 +2507,7 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) switch (payload_type) { case kSR: { + err = on_rtcp_sender_report(ph, length, skt); break; } case kRR: { @@ -1856,6 +2530,10 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) case kPsFb: { err = on_rtcp_ps_feedback(ph, length, skt); break; + } + case kXR: { + err = on_rtcp_xr(ph, length, skt); + break; } default:{ return srs_error_new(ERROR_RTC_RTCP_CHECK, "unknown rtcp type=%u", payload_type); @@ -1874,6 +2552,23 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) return err; } +srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + + if (dtls_session == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); + } + + char* unprotected_buf = new char[1460]; + int nb_unprotected_buf = skt->size(); + if ((err = dtls_session->unprotect_rtp(unprotected_buf, skt->data(), nb_unprotected_buf)) != srs_success) { + return srs_error_wrap(err, "rtp unprotect failed"); + } + + return rtc_publisher->on_rtp(skt, unprotected_buf, nb_unprotected_buf); +} + SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) { lfd = NULL; @@ -2256,7 +2951,11 @@ srs_error_t SrsRtcServer::listen_api() // TODO: FIXME: Fetch api from hybrid manager. SrsHttpServeMux* http_api_mux = _srs_hybrid->srs()->instance()->api_server(); if ((err = http_api_mux->handle("/rtc/v1/play/", new SrsGoApiRtcPlay(this))) != srs_success) { - return srs_error_wrap(err, "handle sdp"); + return srs_error_wrap(err, "handle play"); + } + + if ((err = http_api_mux->handle("/rtc/v1/publish/", new SrsGoApiRtcPublish(this))) != srs_success) { + return srs_error_wrap(err, "handle publish"); } return err; @@ -2369,9 +3068,7 @@ srs_error_t SrsRtcServer::on_rtp_or_rtcp(SrsUdpMuxSocket* skt) if (is_rtcp(reinterpret_cast(skt->data()), skt->size())) { err = rtc_session->on_rtcp(skt); } else { - // We disable it because no RTP for player. - // see https://github.com/ossrs/srs/blob/018577e685a07d9de7a47354e7a9c5f77f5f4202/trunk/src/app/srs_app_rtc_conn.cpp#L1081 - // err = rtc_session->on_rtp(skt); + err = rtc_session->on_rtp(skt); } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index c3796c711..6f6d390f7 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -51,6 +51,8 @@ class SrsSharedPtrMessage; class SrsSource; class SrsRtpPacket2; class ISrsUdpSender; +class SrsRtpQueue; +class SrsRtpH264Demuxer; const uint8_t kSR = 200; const uint8_t kRR = 201; @@ -61,6 +63,7 @@ const uint8_t kApp = 204; // @see: https://tools.ietf.org/html/rfc4585#section-6.1 const uint8_t kRtpFb = 205; const uint8_t kPsFb = 206; +const uint8_t kXR = 207; // @see: https://tools.ietf.org/html/rfc4585#section-6.3 const uint8_t kPLI = 1; @@ -68,6 +71,23 @@ const uint8_t kSLI = 2; const uint8_t kRPSI = 3; const uint8_t kAFB = 15; +class SrsNtp +{ +public: + uint64_t system_ms_; + uint64_t ntp_; + uint32_t ntp_second_; + uint32_t ntp_fractions_; +public: + SrsNtp(); + virtual ~SrsNtp(); +public: + static SrsNtp from_time_ms(uint64_t ms); + static SrsNtp to_time_ms(uint64_t ntp); +public: + static uint64_t kMagicNtpFractionalUnit; +}; + enum SrsRtcSessionStateType { // TODO: FIXME: Should prefixed by enum name. @@ -232,9 +252,37 @@ private: srs_error_t packet_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); }; +class SrsRtcPublisher +{ + friend class SrsRtcSession; +private: + SrsRtcSession* rtc_session; + uint32_t video_ssrc; + uint32_t audio_ssrc; +private: + SrsRtpH264Demuxer* rtp_h264_demuxer; + SrsRtpQueue* rtp_video_queue; + SrsRtpQueue* rtp_audio_queue; +private: + SrsRequest request; + SrsSource* source; + std::string sps; + std::string pps; +public: + SrsRtcPublisher(SrsRtcSession* session); + virtual ~SrsRtcPublisher(); +public: + void initialize(uint32_t vssrc, uint32_t assrc, SrsRequest request); + srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); +private: + srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); + srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); +}; + class SrsRtcSession { friend class SrsRtcSenderThread; + friend class SrsRtcPublisher; private: SrsRtcServer* rtc_server; SrsSdp remote_sdp; @@ -258,6 +306,8 @@ private: public: SrsRequest request; SrsSource* source; +private: + SrsRtcPublisher* rtc_publisher; public: SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id); virtual ~SrsRtcSession(); @@ -283,6 +333,7 @@ public: srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); srs_error_t on_dtls(SrsUdpMuxSocket* skt); srs_error_t on_rtcp(SrsUdpMuxSocket* skt); + srs_error_t on_rtp(SrsUdpMuxSocket* skt); public: srs_error_t send_client_hello(SrsUdpMuxSocket* skt); srs_error_t on_connection_established(SrsUdpMuxSocket* skt); @@ -296,6 +347,8 @@ private: private: srs_error_t on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); + srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); + srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); }; diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp new file mode 100644 index 000000000..393c23263 --- /dev/null +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -0,0 +1,390 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2013-2020 John + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include + +#include +#include +#include + +using namespace std; + +#include +#include +#include +#include + +SrsRtpNackInfo::SrsRtpNackInfo() +{ + generate_time_ = srs_update_system_time(); + pre_req_nack_time_ = 0; + req_nack_count_ = 0; +} + +SrsRtpNackList::SrsRtpNackList(SrsRtpQueue* rtp_queue) +{ + rtp_queue_ = rtp_queue; + pre_check_time_ = 0; + + srs_info("nack opt: max_count=%d, max_alive_time=%us, first_nack_interval=%ld, nack_interval=%ld" + opts_.max_count, opts_.max_alive_time, opts.first_nack_interval, opts_.nack_interval); +} + +SrsRtpNackList::~SrsRtpNackList() +{ +} + +void SrsRtpNackList::insert(uint16_t seq) +{ + // FIXME: full, drop packet, and request key frame. + SrsRtpNackInfo& nack_info = queue_[seq]; +} + +void SrsRtpNackList::remove(uint16_t seq) +{ + queue_.erase(seq); +} + +SrsRtpNackInfo* SrsRtpNackList::find(uint16_t seq) +{ + std::map::iterator iter = queue_.find(seq); + + if (iter == queue_.end()) { + return NULL; + } + + return &(iter->second); +} + +void SrsRtpNackList::dump() +{ + return; + srs_verbose("@debug, queue size=%u", queue_.size()); + for (std::map::iterator iter = queue_.begin(); iter != queue_.end(); ++iter) { + srs_verbose("@debug, nack seq=%u", iter->first); + } +} + +void SrsRtpNackList::get_nack_seqs(vector& seqs) +{ + srs_utime_t now = srs_update_system_time(); + int interval = now - pre_check_time_; + if (interval < opts_.nack_interval / 2) { + return; + } + + pre_check_time_ = now; + std::map::iterator iter = queue_.begin(); + while (iter != queue_.end()) { + const uint16_t& seq = iter->first; + SrsRtpNackInfo& nack_info = iter->second; + + int alive_time = now - nack_info.generate_time_; + if (alive_time > opts_.max_alive_time || nack_info.req_nack_count_ > opts_.max_count) { + srs_verbose("NACK, drop seq=%u alive time %d bigger than max_alive_time=%d OR nack count %d bigger than %d", + seq, alive_time, opts_.max_alive_time, nack_info.req_nack_count_, opts_.max_count); + + rtp_queue_->notify_drop_seq(seq); + queue_.erase(iter++); + continue; + } + + // TODO:Statistics unorder packet. + if (now - nack_info.generate_time_ < opts_.first_nack_interval) { + break; + } + + if (now - nack_info.pre_req_nack_time_ >= opts_.nack_interval && nack_info.req_nack_count_ <= opts_.max_count) { + ++nack_info.req_nack_count_; + nack_info.pre_req_nack_time_ = now; + seqs.push_back(seq); + srs_verbose("NACK, resend seq=%u, count=%d", seq, nack_info.req_nack_count_); + } + + ++iter; + } +} + +void SrsRtpNackList::update_rtt(int rtt) +{ + rtt_ = rtt; + srs_verbose("NACK, update rtt from %ld to %d", opts_.nack_interval, rtt); + // FIXME: limit min and max value. + opts_.nack_interval = rtt_; +} + +SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) + : nack_(this) +{ + capacity_ = capacity; + head_sequence_ = 0; + highest_sequence_ = 0; + initialized_ = false; + start_collected_ = false; + queue_ = new SrsRtpSharedPacket*[capacity_]; + memset(queue_, 0, sizeof(SrsRtpSharedPacket*) * capacity); + + cycle_ = 0; + jitter_ = 0; + last_trans_time_ = 0; + + pre_number_of_packet_received_ = 0; + pre_number_of_packet_lossed_ = 0; + + num_of_packet_received_ = 0; + number_of_packet_lossed_ = 0; + + one_packet_per_frame_ = one_packet_per_frame; +} + +SrsRtpQueue::~SrsRtpQueue() +{ + srs_freepa(queue_); +} + +srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + + uint16_t seq = rtp_pkt->rtp_header.get_sequence(); + + srs_utime_t now = srs_update_system_time(); + + // First packet recv, init head_sequence and highest_sequence. + if (! initialized_) { + initialized_ = true; + head_sequence_ = seq; + highest_sequence_ = seq; + + ++num_of_packet_received_; + + last_trans_time_ = now/1000 - rtp_pkt->rtp_header.get_timestamp()/90; + } else { + SrsRtpNackInfo* nack_info = NULL; + if ((nack_info = nack_.find(seq)) != NULL) { + srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success", seq, now - nack_info->generate_time_, nack_info->req_nack_count_); + nack_.remove(seq); + } else { + // Calc jitter. + { + int trans_time = now/1000 - rtp_pkt->rtp_header.get_timestamp()/90; + + int cur_jitter = trans_time - last_trans_time_; + if (cur_jitter < 0) { + cur_jitter = -cur_jitter; + } + + last_trans_time_ = trans_time; + + jitter_ = (jitter_ * 15.0 / 16.0) + (static_cast(cur_jitter) / 16.0); + srs_verbose("jitter=%.2f", jitter_); + } + + ++num_of_packet_received_; + // seq > highest_sequence_ + if (seq_cmp(highest_sequence_, seq)) { + insert_into_nack_list(highest_sequence_ + 1, seq); + + if (seq < highest_sequence_) { + srs_verbose("warp around, cycle=%lu", cycle_); + ++cycle_; + } + highest_sequence_ = seq; + } else { + // Because we don't know the ISN(initiazlie sequence number), the first packet + // we received maybe no the first paacet client sented. + if (! start_collected_) { + if (seq_cmp(seq, head_sequence_)) { + srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", head_sequence_, seq); + head_sequence_ = seq; + } + insert_into_nack_list(seq + 1, highest_sequence_); + } else { + srs_verbose("seq=%u, rtx success, too old", seq); + } + } + } + } + + int delay = highest_sequence_ - head_sequence_ + 1; + srs_verbose("seqs range=[%u-%u], delay=%d", head_sequence_, highest_sequence_, delay); + + // Check seqs out of range. + if (head_sequence_ + capacity_ < highest_sequence_) { + srs_verbose("try collect packet becuase seq out of range"); + collect_packet(); + } + while (head_sequence_ + capacity_ < highest_sequence_) { + srs_trace("seqs out of range, head seq=%u, hightest seq=%u", head_sequence_, highest_sequence_); + remove(head_sequence_); + uint16_t s = head_sequence_ + 1; + for ( ; s != highest_sequence_; ++s) { + SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; + // Choose the new head sequence. Must be the first packet of frame. + if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { + srs_trace("find except, update head seq from %u to %u when seqs out of range", head_sequence_, s); + head_sequence_ = s; + break; + } + + // Drop the seq. + nack_.remove(s); + srs_verbose("seqs out of range, drop seq=%u", s); + if (pkt && pkt->rtp_header.get_sequence() == s) { + delete pkt; + pkt = NULL; + } + } + srs_trace("force update, update head seq from %u to %u when seqs out of range", head_sequence_, s); + head_sequence_ = s; + } + + SrsRtpSharedPacket* old_pkt = queue_[seq % capacity_]; + if (old_pkt) { + delete old_pkt; + } + + queue_[seq % capacity_] = rtp_pkt->copy(); + + // Marker bit means the last packet of frame received. + if (rtp_pkt->rtp_header.get_marker() || (highest_sequence_ - head_sequence_ >= capacity_ / 2) || one_packet_per_frame_) { + collect_packet(); + } + + return err; +} + +srs_error_t SrsRtpQueue::remove(uint16_t seq) +{ + srs_error_t err = srs_success; + + SrsRtpSharedPacket*& pkt = queue_[seq % capacity_]; + if (pkt && pkt->rtp_header.get_sequence() == seq) { + delete pkt; + pkt = NULL; + } + + return err; +} + +void SrsRtpQueue::get_and_clean_collected_frames(std::vector >& frames) +{ + frames.swap(frames_); +} + +void SrsRtpQueue::notify_drop_seq(uint16_t seq) +{ + uint16_t s = seq + 1; + for ( ; s != highest_sequence_; ++s) { + SrsRtpSharedPacket* pkt = queue_[s % capacity_]; + if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { + break; + } + } + + srs_verbose("drop seq=%u, highest seq=%u, update head seq %u to %u", seq, highest_sequence_, head_sequence_, s); + head_sequence_ = s; +} + +uint32_t SrsRtpQueue::get_extended_highest_sequence() +{ + return cycle_ * 65536 + highest_sequence_; +} + +uint8_t SrsRtpQueue::get_fraction_lost() +{ + int64_t total = (number_of_packet_lossed_ - pre_number_of_packet_lossed_ + num_of_packet_received_ - pre_number_of_packet_received_); + uint8_t loss = 0; + if (total > 0) { + loss = (number_of_packet_lossed_ - pre_number_of_packet_lossed_) * 256 / total; + } + + pre_number_of_packet_lossed_ = number_of_packet_lossed_; + pre_number_of_packet_received_ = num_of_packet_received_; + + return loss; +} + +uint32_t SrsRtpQueue::get_cumulative_number_of_packets_lost() +{ + return number_of_packet_lossed_; +} + +uint32_t SrsRtpQueue::get_interarrival_jitter() +{ + return static_cast(jitter_); +} + +void SrsRtpQueue::update_rtt(int rtt) +{ + nack_.update_rtt(rtt); +} + +void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) +{ + for (uint16_t s = seq_start; s != seq_end; ++s) { + srs_verbose("loss seq=%u, insert into nack list", s); + nack_.insert(s); + ++number_of_packet_lossed_; + } + + // FIXME: Record key frame sequence. + // FIXME: When nack list too long, clear and send PLI. +} + +void SrsRtpQueue::collect_packet() +{ + vector frame; + for (uint16_t s = head_sequence_; s != highest_sequence_; ++s) { + SrsRtpSharedPacket* pkt = queue_[s % capacity_]; + + nack_.dump(); + + if (nack_.find(s) != NULL) { + srs_verbose("seq=%u, found in nack list when collect frame", s); + break; + } + + // We must collect frame from first packet to last packet. + if (s == head_sequence_ && pkt->rtp_payload_size() != 0 && ! pkt->rtp_payload_header->is_first_packet_of_frame) { + break; + } + + frame.push_back(pkt->copy()); + if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { + if (! start_collected_) { + start_collected_ = true; + } + frames_.push_back(frame); + frame.clear(); + + srs_verbose("head seq=%u, update to %u because collect one full farme", head_sequence_, s + 1); + head_sequence_ = s + 1; + } + } + + // remove the tmp buffer + for (size_t i = 0; i < frame.size(); ++i) { + srs_freep(frame[i]); + } +} diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp new file mode 100644 index 000000000..6e71b15cd --- /dev/null +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -0,0 +1,157 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2013-2020 John + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef SRS_APP_RTP_QUEUE_HPP +#define SRS_APP_RTP_QUEUE_HPP + +#include + +#include +#include +#include + +class SrsRtpSharedPacket; +class SrsRtpQueue; + +struct SrsNackOption +{ + SrsNackOption() + { + // Default nack option. + max_count = 5; + max_alive_time = 2 * SRS_UTIME_SECONDS; + first_nack_interval = 10 * SRS_UTIME_MILLISECONDS; + nack_interval = 400 * SRS_UTIME_MILLISECONDS; + } + int max_count; + srs_utime_t max_alive_time; + int64_t first_nack_interval; + int64_t nack_interval; +}; + +struct SrsRtpNackInfo +{ + SrsRtpNackInfo(); + + // Use to control the time of first nack req and the life of seq. + srs_utime_t generate_time_; + // Use to control nack interval. + srs_utime_t pre_req_nack_time_; + // Use to control nack times. + int req_nack_count_; +}; + +inline bool seq_cmp(const uint16_t& l, const uint16_t& r) +{ + return ((int16_t)(r - l)) > 0; +} + +struct SeqComp +{ + bool operator()(const uint16_t& l, const uint16_t& r) const + { + return seq_cmp(l, r); + } +}; + +class SrsRtpNackList +{ +private: + // Nack queue, seq order, oldest to newest. + std::map queue_; + SrsRtpQueue* rtp_queue_; + SrsNackOption opts_; +private: + srs_utime_t pre_check_time_; +private: + int rtt_; +public: + SrsRtpNackList(SrsRtpQueue* rtp_queue); + virtual ~SrsRtpNackList(); +public: + void insert(uint16_t seq); + void remove(uint16_t seq); + SrsRtpNackInfo* find(uint16_t seq); +public: + void dump(); +public: + void get_nack_seqs(std::vector& seqs); +public: + void update_rtt(int rtt); +}; + +class SrsRtpQueue +{ +private: + /* + *[seq1|seq2|seq3|seq4|seq5 ... seq10|seq11(loss)|seq12(loss)|seq13] + * \___(head_sequence_) \ \___(highest_sequence_) + * \___(no received, in nack list) + */ + // Capacity of the ring-buffer. + size_t capacity_; + // Thei highest sequence we have receive. + uint16_t highest_sequence_; + // The sequence waitting to read. + uint16_t head_sequence_; + bool initialized_; + bool start_collected_; + // Ring bufer. + SrsRtpSharedPacket** queue_; +private: + uint64_t cycle_; + double jitter_; + int64_t last_trans_time_; + uint64_t pre_number_of_packet_received_; + uint64_t pre_number_of_packet_lossed_; + uint64_t num_of_packet_received_; + uint64_t number_of_packet_lossed_; +private: + bool one_packet_per_frame_; +public: + SrsRtpNackList nack_; +private: + std::vector > frames_; +public: + SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); + virtual ~SrsRtpQueue(); +public: + srs_error_t insert(SrsRtpSharedPacket* rtp_pkt); + srs_error_t remove(uint16_t seq); +public: + void get_and_clean_collected_frames(std::vector >& frames); + void notify_drop_seq(uint16_t seq); +public: + uint32_t get_extended_highest_sequence(); + uint8_t get_fraction_lost(); + uint32_t get_cumulative_number_of_packets_lost(); + uint32_t get_interarrival_jitter(); +public: + void update_rtt(int rtt); +private: + void insert_into_nack_list(uint16_t seq_start, uint16_t seq_end); +private: + void collect_packet(); +}; + +#endif diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index 5c23cbd34..daf73ac32 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -32,19 +32,10 @@ using namespace std; #include #include -// @see: https://tools.ietf.org/html/rfc6184#section-5.2 -const uint8_t kStapA = 24; - -// @see: https://tools.ietf.org/html/rfc6184#section-5.2 -const uint8_t kFuA = 28; - -// @see: https://tools.ietf.org/html/rfc6184#section-5.8 -const uint8_t kStart = 0x80; // Fu-header start bit -const uint8_t kEnd = 0x40; // Fu-header end bit - SrsRtpHeader::SrsRtpHeader() { padding = false; + padding_length = 0; extension = false; cc = 0; marker = false; @@ -72,9 +63,70 @@ SrsRtpHeader::~SrsRtpHeader() srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) { - srs_error_t err = srs_success; + srs_error_t err = srs_success; - // TODO: FIXME: Implements it. + if (stream->size() < kRtpHeaderFixedSize) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); + } + + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|X| CC |M| PT | sequence number | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | timestamp | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | synchronization source (SSRC) identifier | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + | contributing source (CSRC) identifiers | + | .... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + + uint8_t first = stream->read_1bytes(); + padding = (first & 0x20); + extension = (first & 0x10); + cc = (first & 0x0F); + + uint8_t second = stream->read_1bytes(); + marker = (second & 0x80); + payload_type = (second & 0x7F); + + sequence = stream->read_2bytes(); + timestamp = stream->read_4bytes(); + ssrc = stream->read_4bytes(); + + if (stream->size() < header_size()) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); + } + + for (uint8_t i = 0; i < cc; ++i) { + csrc[i] = stream->read_4bytes(); + } + + if (extension) { + // TODO: + uint16_t profile_id = stream->read_2bytes(); + extension_length = stream->read_2bytes(); + // @see: https://tools.ietf.org/html/rfc3550#section-5.3.1 + stream->skip(extension_length * 4); + + srs_verbose("extension, profile_id=%u, length=%u", profile_id, extension_length); + + // @see: https://tools.ietf.org/html/rfc5285#section-4.2 + if (profile_id == 0xBEDE) { + } + } + + if (padding) { + padding_length = *(reinterpret_cast(stream->data() + stream->size() - 1)); + if (padding_length > (stream->size() - stream->pos())) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); + } + + srs_verbose("offset=%d, padding_length=%u", stream->size(), padding_length); + } return err; } @@ -173,6 +225,7 @@ SrsRtpPacket2::~SrsRtpPacket2() void SrsRtpPacket2::set_padding(int size) { rtp_header.set_padding(size > 0); + rtp_header.set_padding_length(size); if (cache_payload) { cache_payload += size - padding; } @@ -182,6 +235,7 @@ void SrsRtpPacket2::set_padding(int size) void SrsRtpPacket2::add_padding(int size) { rtp_header.set_padding(padding + size > 0); + rtp_header.set_padding_length(rtp_header.get_padding_length() + size); if (cache_payload) { cache_payload += size; } @@ -552,6 +606,69 @@ srs_error_t SrsRtpFUAPayload2::encode(SrsBuffer* buf) return srs_success; } +SrsRtpPayloadHeader::SrsRtpPayloadHeader() +{ + is_first_packet_of_frame = false; + is_last_packet_of_frame = false; +} + +SrsRtpPayloadHeader::~SrsRtpPayloadHeader() +{ +} + +SrsRtpPayloadHeader::SrsRtpPayloadHeader(const SrsRtpPayloadHeader& rhs) +{ + operator=(rhs); +} + +SrsRtpPayloadHeader& SrsRtpPayloadHeader::operator=(const SrsRtpPayloadHeader& rhs) +{ + is_first_packet_of_frame = rhs.is_first_packet_of_frame; + is_last_packet_of_frame = rhs.is_last_packet_of_frame; +} + +SrsRtpH264Header::SrsRtpH264Header() : SrsRtpPayloadHeader() +{ +} + +SrsRtpH264Header::~SrsRtpH264Header() +{ +} + +SrsRtpH264Header::SrsRtpH264Header(const SrsRtpH264Header& rhs) +{ + operator=(rhs); +} + +SrsRtpH264Header& SrsRtpH264Header::operator=(const SrsRtpH264Header& rhs) +{ + SrsRtpPayloadHeader::operator=(rhs); + nalu_type = rhs.nalu_type; + nalu_header = rhs.nalu_header; + nalu_offset = rhs.nalu_offset; + + return *this; +} + +SrsRtpOpusHeader::SrsRtpOpusHeader() : SrsRtpPayloadHeader() +{ +} + +SrsRtpOpusHeader::~SrsRtpOpusHeader() +{ +} + +SrsRtpOpusHeader::SrsRtpOpusHeader(const SrsRtpOpusHeader& rhs) +{ + operator=(rhs); +} + +SrsRtpOpusHeader& SrsRtpOpusHeader::operator=(const SrsRtpOpusHeader& rhs) +{ + SrsRtpPayloadHeader::operator=(rhs); + return *this; +} + SrsRtpSharedPacket::SrsRtpSharedPacketPayload::SrsRtpSharedPacketPayload() { payload = NULL; @@ -570,6 +687,8 @@ SrsRtpSharedPacket::SrsRtpSharedPacket() payload = NULL; size = 0; + + rtp_payload_header = NULL; } SrsRtpSharedPacket::~SrsRtpSharedPacket() @@ -581,9 +700,11 @@ SrsRtpSharedPacket::~SrsRtpSharedPacket() --payload_ptr->shared_count; } } + + srs_freep(rtp_payload_header); } -srs_error_t SrsRtpSharedPacket::create(int64_t timestamp, uint16_t sequence, uint32_t ssrc, uint16_t payload_type, char* p, int s) +srs_error_t SrsRtpSharedPacket::create(SrsRtpHeader* rtp_h, SrsRtpPayloadHeader* rtp_ph, char* p, int s) { srs_error_t err = srs_success; @@ -593,10 +714,8 @@ srs_error_t SrsRtpSharedPacket::create(int64_t timestamp, uint16_t sequence, uin srs_assert(!payload_ptr); - rtp_header.set_timestamp(timestamp); - rtp_header.set_sequence(sequence); - rtp_header.set_ssrc(ssrc); - rtp_header.set_payload_type(payload_type); + this->rtp_header = *rtp_h; + this->rtp_payload_header = rtp_ph; // TODO: rtp header padding. size_t buffer_size = rtp_header.header_size() + s; @@ -619,6 +738,25 @@ srs_error_t SrsRtpSharedPacket::create(int64_t timestamp, uint16_t sequence, uin return err; } +srs_error_t SrsRtpSharedPacket::decode(char* buf, int nb_buf) +{ + srs_error_t err = srs_success; + + SrsBuffer stream(buf, nb_buf); + if ((err = rtp_header.decode(&stream)) != srs_success) { + return srs_error_wrap(err, "rtp header decode failed"); + } + + payload_ptr = new SrsRtpSharedPacketPayload(); + payload_ptr->payload = buf; + payload_ptr->size = nb_buf; + + this->payload = payload_ptr->payload; + this->size = payload_ptr->size; + + return err; +} + SrsRtpSharedPacket* SrsRtpSharedPacket::copy() { SrsRtpSharedPacket* copy = new SrsRtpSharedPacket(); @@ -627,6 +765,11 @@ SrsRtpSharedPacket* SrsRtpSharedPacket::copy() payload_ptr->shared_count++; copy->rtp_header = rtp_header; + if (dynamic_cast(rtp_payload_header)) { + copy->rtp_payload_header = new SrsRtpH264Header(*(dynamic_cast(rtp_payload_header))); + } else if (dynamic_cast(rtp_payload_header)) { + copy->rtp_payload_header = new SrsRtpOpusHeader(*(dynamic_cast(rtp_payload_header))); + } copy->payload = payload; copy->size = size; diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index 349c388a5..2ad222bee 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -37,6 +37,17 @@ const uint8_t kRtpMarker = 0x80; // H.264 nalu header type mask. const uint8_t kNalTypeMask = 0x1F; +// @see: https://tools.ietf.org/html/rfc6184#section-5.2 +const uint8_t kStapA = 24; + +// @see: https://tools.ietf.org/html/rfc6184#section-5.2 +const uint8_t kFuA = 28; + +// @see: https://tools.ietf.org/html/rfc6184#section-5.8 +const uint8_t kStart = 0x80; // Fu-header start bit +const uint8_t kEnd = 0x40; // Fu-header end bit + + class SrsBuffer; class SrsRtpRawPayload; class SrsRtpFUAPayload2; @@ -45,6 +56,7 @@ class SrsRtpHeader { private: bool padding; + uint8_t padding_length; bool extension; uint8_t cc; bool marker; @@ -76,6 +88,8 @@ public: inline void set_ssrc(uint32_t v) { ssrc = v; } uint32_t get_ssrc() const { return ssrc; } inline void set_padding(bool v) { padding = v; } + inline void set_padding_length(uint8_t v) { padding_length = v; } + uint8_t get_padding_length() const { return padding_length; } }; class SrsRtpPacket2 @@ -212,6 +226,40 @@ public: virtual srs_error_t encode(SrsBuffer* buf); }; +class SrsRtpPayloadHeader +{ +public: + bool is_first_packet_of_frame; + bool is_last_packet_of_frame; +public: + SrsRtpPayloadHeader(); + virtual ~SrsRtpPayloadHeader(); + SrsRtpPayloadHeader(const SrsRtpPayloadHeader& rhs); + SrsRtpPayloadHeader& operator=(const SrsRtpPayloadHeader& rhs); +}; + +class SrsRtpOpusHeader : public SrsRtpPayloadHeader +{ +public: + SrsRtpOpusHeader(); + virtual ~SrsRtpOpusHeader(); + SrsRtpOpusHeader(const SrsRtpOpusHeader& rhs); + SrsRtpOpusHeader& operator=(const SrsRtpOpusHeader& rhs); +}; + +class SrsRtpH264Header : public SrsRtpPayloadHeader +{ +public: + uint8_t nalu_type; + uint8_t nalu_header; + std::vector > nalu_offset; // offset, size +public: + SrsRtpH264Header(); + virtual ~SrsRtpH264Header(); + SrsRtpH264Header(const SrsRtpH264Header& rhs); + SrsRtpH264Header& operator=(const SrsRtpH264Header& rhs); +}; + class SrsRtpSharedPacket { private: @@ -230,14 +278,19 @@ private: SrsRtpSharedPacketPayload* payload_ptr; public: SrsRtpHeader rtp_header; + SrsRtpPayloadHeader* rtp_payload_header; char* payload; int size; public: SrsRtpSharedPacket(); virtual ~SrsRtpSharedPacket(); public: - srs_error_t create(int64_t timestamp, uint16_t sequence, uint32_t ssrc, uint16_t payload_type, char* payload, int size); + srs_error_t create(SrsRtpHeader* rtp_h, SrsRtpPayloadHeader* rtp_ph, char* p, int s); + srs_error_t decode(char* buf, int nb_buf); SrsRtpSharedPacket* copy(); +public: + char* rtp_payload() { return payload + rtp_header.header_size(); } + int rtp_payload_size() { return size - rtp_header.header_size() - rtp_header.get_padding_length(); } // Interface to modify rtp header public: srs_error_t modify_rtp_header_marker(bool marker); From 1951cc8e5fd05e3d738335f9234c41f2cfee6bcb Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Thu, 23 Apr 2020 23:14:30 +0800 Subject: [PATCH 06/79] remove some debug code --- trunk/src/app/srs_app_rtc_conn.cpp | 759 +++++++++++++++------------- trunk/src/app/srs_app_rtc_conn.hpp | 26 +- trunk/src/app/srs_app_rtp_queue.hpp | 2 +- 3 files changed, 425 insertions(+), 362 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index eba344f55..e228a2464 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -124,7 +124,40 @@ static std::vector get_candidate_ips() return candidate_ips; } -static map ssrc_lxr; + +static int cal_rtp_frame_size(const vector& frame, int& frame_size, vector& nalu_lens) +{ + uint32_t nalu_len = 0; + for (size_t n = 0; n < frame.size(); ++n) { + SrsRtpH264Header* rtp_h264_header = dynamic_cast(frame[n]->rtp_payload_header); + for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { + if (rtp_h264_header->nalu_type != kFuA) { + uint8_t* p = reinterpret_cast(frame[n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); + if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSPS) && + ((p[0] & kNalTypeMask) != SrsAvcNaluTypePPS)) { + frame_size += rtp_h264_header->nalu_offset[j].second + 4; + nalu_lens.push_back(rtp_h264_header->nalu_offset[j].second); + } + } else { + if (frame[n]->rtp_payload_header->is_first_packet_of_frame) { + frame_size += 5; + nalu_len += 1; + } + frame_size += rtp_h264_header->nalu_offset[j].second; + nalu_len += rtp_h264_header->nalu_offset[j].second; + + if (frame[n]->rtp_payload_header->is_last_packet_of_frame) { + nalu_lens.push_back(nalu_len); + nalu_len = 0; + } + } + } + } + + return frame_size; +} uint64_t SrsNtp::kMagicNtpFractionalUnit = 1ULL << 32; @@ -1456,6 +1489,10 @@ srs_error_t SrsRtcSenderThread::packet_stap_a(SrsSource* source, SrsSharedPtrMes SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) { + sendonly_ukt = NULL; + + report_timer = new SrsHourGlass(this, 20 * SRS_UTIME_MILLISECONDS); + rtc_session = session; rtp_h264_demuxer = new SrsRtpH264Demuxer(); rtp_video_queue = new SrsRtpQueue(1000); @@ -1466,18 +1503,54 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) SrsRtcPublisher::~SrsRtcPublisher() { + srs_freep(report_timer); srs_freep(rtp_h264_demuxer); srs_freep(rtp_video_queue); srs_freep(rtp_audio_queue); } -void SrsRtcPublisher::initialize(uint32_t vssrc, uint32_t assrc, SrsRequest request) +srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest request) { + srs_error_t err = srs_success; + + sendonly_ukt = skt; + video_ssrc = vssrc; audio_ssrc = assrc; this->request = request; srs_verbose("video_ssrc=%u, audio_ssrc=%u", video_ssrc, audio_ssrc); + + if ((err = report_timer->tick(0 * SRS_UTIME_MILLISECONDS)) != srs_success) { + return srs_error_wrap(err, "hourglass tick"); + } + + if ((err = report_timer->start()) != srs_success) { + return srs_error_wrap(err, "start report_timer"); + } + + return err; +} + +void SrsRtcPublisher::update_sendonly_socket(SrsUdpMuxSocket* skt) +{ + srs_trace("session %s address changed, update %s -> %s", + rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), skt->get_peer_id().c_str()); + + srs_freep(sendonly_ukt); + sendonly_ukt = skt->copy_sendonly(); +} + +srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) +{ + if (sendonly_ukt) { + send_rtcp_rr(sendonly_ukt, video_ssrc, rtp_video_queue); + send_rtcp_rr(sendonly_ukt, audio_ssrc, rtp_audio_queue); + send_rtcp_xr_rrtr(sendonly_ukt, video_ssrc); + send_rtcp_xr_rrtr(sendonly_ukt, audio_ssrc); + } + + return srs_success; } srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) @@ -1501,47 +1574,298 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); } -srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt) { - srs_error_t err = srs_success; - return err; - vector nack_seqs; - rtp_audio_queue->nack_.get_nack_seqs(nack_seqs); + rtp_queue->nack_.get_nack_seqs(nack_seqs); vector::iterator iter = nack_seqs.begin(); while (iter != nack_seqs.end()) { - char buf[1024]; + char buf[kRtpPacketSize]; SrsBuffer stream(buf, sizeof(buf)); + // FIXME: Replace magic number. stream.write_1bytes(0x81); stream.write_1bytes(kRtpFb); stream.write_2bytes(3); - stream.write_4bytes(audio_ssrc); - stream.write_4bytes(audio_ssrc); + stream.write_4bytes(ssrc); + stream.write_4bytes(ssrc); uint16_t pid = *iter; uint16_t blp = 0; - srs_verbose("pid=%u", pid); while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { blp |= (1 << (*(iter + 1) - pid - 1)); - srs_verbose("blp=%u", *(iter+1)); ++iter; } + stream.write_2bytes(pid); stream.write_2bytes(blp); - srs_verbose("nack dump=%s", srs_string_dumps_hex(stream.data(), stream.pos()).c_str()); - char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); + // FIXME: Merge nack rtcp into one packets. if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { skt->sendto(protected_buf, nb_protected_buf, 0); - //skt->sendto(stream.data(), stream.pos(), 0); - srs_verbose("send nack req, len=%d", nb_protected_buf); - } else { - srs_verbose("send nack failed, because of protect rtcp failed"); } + ++iter; } +} + +srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + + SrsBuffer* stream = new SrsBuffer(buf, nb_buf); + SrsAutoFree(SrsBuffer, stream); + + // @see: https://tools.ietf.org/html/rfc3550#section-6.4.1 + /* + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +header |V=2|P| RC | PT=SR=200 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC of sender | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +sender | NTP timestamp, most significant word | +info +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, least significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | RTP timestamp | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sender's packet count | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sender's octet count | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +report | SSRC_1 (SSRC of first source) | +block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 1 | fraction lost | cumulative number of packets lost | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | extended highest sequence number received | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | interarrival jitter | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | last SR (LSR) | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | delay since last SR (DLSR) | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +report | SSRC_2 (SSRC of second source) | +block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 2 : ... : + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + | profile-specific extensions | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + uint8_t first = stream->read_1bytes(); + uint8_t rc = first & 0x1F; + + uint8_t payload_type = stream->read_1bytes(); + srs_assert(payload_type == kSR); + uint16_t length = stream->read_2bytes(); + + if (((length + 1) * 4) != (rc * 24 + 28)) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtcp sender report packet, length=%u, rc=%u", length, rc); + } + + uint32_t ssrc_of_sender = stream->read_4bytes(); + uint64_t ntp = stream->read_8bytes(); + SrsNtp srs_ntp = SrsNtp::to_time_ms(ntp); + uint32_t rtp_time = stream->read_4bytes(); + uint32_t sender_packet_count = stream->read_4bytes(); + uint32_t sender_octec_count = stream->read_4bytes(); + + srs_verbose("sender report, ssrc_of_sender=%u, rtp_time=%u, sender_packet_count=%u, sender_octec_count=%u", + ssrc_of_sender, rtp_time, sender_packet_count, sender_octec_count); + + for (int i = 0; i < rc; ++i) { + uint32_t ssrc = stream->read_4bytes(); + uint8_t fraction_lost = stream->read_1bytes(); + uint32_t cumulative_number_of_packets_lost = stream->read_3bytes(); + uint32_t highest_seq = stream->read_4bytes(); + uint32_t jitter = stream->read_4bytes(); + uint32_t lst = stream->read_4bytes(); + uint32_t dlsr = stream->read_4bytes(); + + (void)ssrc; (void)fraction_lost; (void)cumulative_number_of_packets_lost; (void)highest_seq; (void)jitter; (void)lst; (void)dlsr; + srs_verbose("sender report, ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, highest_seq=%u, jitter=%u, lst=%u, dlst=%u", + ssrc, fraction_lost, cumulative_number_of_packets_lost, highest_seq, jitter, lst, dlsr); + } + + last_sender_report_ntp[ssrc_of_sender] = srs_ntp; + last_sender_report_sys_time[ssrc_of_sender] = srs_update_system_time(); + + return err; +} + +srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + /* + @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-2 + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|reserved | PT=XR=207 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + : report blocks : + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + + SrsBuffer stream(buf, nb_buf); + uint8_t first = stream.read_1bytes(); + uint8_t pt = stream.read_1bytes(); + uint16_t length = (stream.read_2bytes() + 1) * 4; + uint32_t ssrc = stream.read_4bytes(); + + if (length != nb_buf) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet, length=%u, nb_buf=%d", length, nb_buf); + } + + while (stream.pos() + 4 < length) { + uint8_t bt = stream.read_1bytes(); + stream.skip(1); + uint16_t block_length = (stream.read_2bytes() + 1) * 4; + + if (stream.pos() + block_length - 4 > nb_buf) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet block, block_length=%u, nb_buf=%d", block_length, nb_buf); + } + + if (bt == 5) { + for (int i = 4; i < block_length; i += 12) { + uint32_t ssrc = stream.read_4bytes(); + uint32_t lrr = stream.read_4bytes(); + uint32_t dlrr = stream.read_4bytes(); + + SrsNtp cur_ntp = SrsNtp::from_time_ms(srs_update_system_time() / 1000); + uint32_t compact_ntp = (cur_ntp.ntp_second_ << 16) | (cur_ntp.ntp_fractions_ >> 16); + + int rtt_ntp = compact_ntp - lrr - dlrr; + int rtt = ((rtt_ntp * 1000) >> 16) + ((rtt_ntp >> 16) * 1000); + srs_verbose("ssrc=%u, compact_ntp=%u, lrr=%u, dlrr=%u, rtt=%d", + ssrc, compact_ntp, lrr, dlrr, rtt); + + if (ssrc == video_ssrc) { + rtp_video_queue->update_rtt(rtt); + } else if (ssrc == audio_ssrc) { + rtp_audio_queue->update_rtt(rtt); + } + } + } + } + + return err; +} + +srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue) +{ + srs_error_t err = srs_success; + + char buf[kRtpPacketSize]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x81); + stream.write_1bytes(kRR); + stream.write_2bytes(7); + stream.write_4bytes(ssrc); + + uint8_t fraction_lost = rtp_queue->get_fraction_lost(); + uint32_t cumulative_number_of_packets_lost = rtp_queue->get_cumulative_number_of_packets_lost() & 0x7FFFFF; + uint32_t extended_highest_sequence = rtp_queue->get_extended_highest_sequence(); + uint32_t interarrival_jitter = rtp_queue->get_interarrival_jitter(); + + uint32_t rr_lsr = 0; + uint32_t rr_dlsr = 0; + + const uint64_t& lsr_systime = last_sender_report_sys_time[ssrc]; + const SrsNtp& lsr_ntp = last_sender_report_ntp[ssrc]; + + if (lsr_systime > 0) { + rr_lsr = (lsr_ntp.ntp_second_ << 16) | (lsr_ntp.ntp_fractions_ >> 16); + uint32_t dlsr = (srs_update_system_time() - lsr_systime) / 1000; + rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); + } + + stream.write_4bytes(ssrc); + stream.write_1bytes(fraction_lost); + stream.write_3bytes(cumulative_number_of_packets_lost); + stream.write_4bytes(extended_highest_sequence); + stream.write_4bytes(interarrival_jitter); + stream.write_4bytes(rr_lsr); + stream.write_4bytes(rr_dlsr); + + srs_verbose("RR ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, extended_highest_sequence=%u, interarrival_jitter=%u", + ssrc, fraction_lost, cumulative_number_of_packets_lost, extended_highest_sequence, interarrival_jitter); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + return srs_error_wrap(err, "protect rtcp rr"); + } + + skt->sendto(protected_buf, nb_protected_buf, 0); + return err; +} + +srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc) +{ + srs_error_t err = srs_success; + /* + @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-2 + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|reserved | PT=XR=207 | length | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | SSRC | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + : report blocks : + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-4.4 + + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | BT=4 | reserved | block length = 2 | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, most significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, least significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + srs_utime_t now = srs_update_system_time(); + SrsNtp cur_ntp = SrsNtp::from_time_ms(now / 1000); + + char buf[kRtpPacketSize]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x80); + stream.write_1bytes(kXR); + stream.write_2bytes(4); + stream.write_4bytes(ssrc); + stream.write_1bytes(4); + stream.write_1bytes(0); + stream.write_2bytes(2); + stream.write_4bytes(cur_ntp.ntp_second_); + stream.write_4bytes(cur_ntp.ntp_fractions_); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + return srs_error_wrap(err, "protect rtcp xr"); + } + + skt->sendto(protected_buf, nb_protected_buf, 0); + + return err; +} + + +srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + rtp_pkt->rtp_payload_header = new SrsRtpOpusHeader(); rtp_pkt->rtp_payload_header->is_first_packet_of_frame = true; @@ -1549,6 +1873,15 @@ srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_audio_queue->insert(rtp_pkt); + check_send_nacks(rtp_audio_queue, audio_ssrc, skt); + + return collect_audio_frame(); +} + +srs_error_t SrsRtcPublisher::collect_audio_frame() +{ + srs_error_t err = srs_success; + std::vector > frames; rtp_audio_queue->get_and_clean_collected_frames(frames); @@ -1570,43 +1903,6 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* { srs_error_t err = srs_success; - vector nack_seqs; - rtp_video_queue->nack_.get_nack_seqs(nack_seqs); - vector::iterator iter = nack_seqs.begin(); - while (iter != nack_seqs.end()) { - char buf[1024]; - SrsBuffer stream(buf, sizeof(buf)); - stream.write_1bytes(0x81); - stream.write_1bytes(kRtpFb); - stream.write_2bytes(3); - stream.write_4bytes(video_ssrc); - stream.write_4bytes(video_ssrc); - uint16_t pid = *iter; - uint16_t blp = 0; - srs_verbose("pid=%u", pid); - while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { - blp |= (1 << (*(iter + 1) - pid - 1)); - srs_verbose("blp=%u", *(iter+1)); - ++iter; - } - stream.write_2bytes(pid); - stream.write_2bytes(blp); - - srs_verbose("nack dump=%s", srs_string_dumps_hex(stream.data(), stream.pos()).c_str()); - - char protected_buf[kRtpPacketSize]; - int nb_protected_buf = stream.pos(); - - if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { - skt->sendto(protected_buf, nb_protected_buf, 0); - //skt->sendto(stream.data(), stream.pos(), 0); - srs_verbose("send nack req, len=%d", nb_protected_buf); - } else { - srs_verbose("send nack failed, because of protect rtcp failed"); - } - ++iter; - } - rtp_pkt->rtp_payload_header = new SrsRtpH264Header(); if ((err = rtp_h264_demuxer->parse(rtp_pkt)) != srs_success) { @@ -1615,46 +1911,32 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_video_queue->insert(rtp_pkt); + check_send_nacks(rtp_video_queue, video_ssrc, skt); + + return collect_video_frame(); +} + +srs_error_t SrsRtcPublisher::collect_video_frame() +{ + srs_error_t err = srs_success; + std::vector > frames; rtp_video_queue->get_and_clean_collected_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { if (! frames[i].empty()) { - srs_verbose("collect %d video frames, seq range %u,%u", frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); + srs_verbose("collect %d video frames, seq range %u,%u", + frames.size(), frames[i].front()->rtp_header.get_sequence(), + frames[i].back()->rtp_header.get_sequence()); } + int frame_size = 5; - vector nalu_len; - uint32_t len = 0; - for (size_t n = 0; n < frames[i].size(); ++n) { - SrsRtpH264Header* rtp_h264_header = dynamic_cast(frames[i][n]->rtp_payload_header); - for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { - if (rtp_h264_header->nalu_type != kFuA) { - uint8_t* p = reinterpret_cast(frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); - if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSPS) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypePPS)) { - frame_size += rtp_h264_header->nalu_offset[j].second + 4; - nalu_len.push_back(rtp_h264_header->nalu_offset[j].second); - } - } else { - if (frames[i][n]->rtp_payload_header->is_first_packet_of_frame) { - frame_size += 5; - len += 1; - } - frame_size += rtp_h264_header->nalu_offset[j].second; - len += rtp_h264_header->nalu_offset[j].second; + vector nalu_lens; + cal_rtp_frame_size(frames[i], frame_size, nalu_lens); - if (frames[i][n]->rtp_payload_header->is_last_packet_of_frame) { - nalu_len.push_back(len); - len = 0; - } - } - } - } - - uint8_t* frame = new uint8_t[frame_size]; - int frame_len = 5; + uint8_t* frame_buffer = new uint8_t[frame_size]; + // Skip flv video tag header. + int frame_buffer_index = 5; bool video_header_change = false; int64_t timestamp = 0; @@ -1667,48 +1949,42 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* timestamp = frames[i][n]->rtp_header.get_timestamp(); uint8_t* p = reinterpret_cast(frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); - srs_verbose("nalu_type=%u, %02X", rtp_h264_header->nalu_type, p[0]); if (rtp_h264_header->nalu_type != kFuA) { if ((p[0] & kNalTypeMask) == SrsAvcNaluTypeSPS) { - srs_verbose("sps"); string cur_sps = string((char*)p, rtp_h264_header->nalu_offset[j].second); if (! cur_sps.empty() && sps != cur_sps) { video_header_change = true; sps = cur_sps; } } else if ((p[0] & kNalTypeMask) == SrsAvcNaluTypePPS) { - srs_verbose("pps"); string cur_pps = string((char*)p, rtp_h264_header->nalu_offset[j].second); if (! cur_pps.empty() && pps != cur_pps) { video_header_change = true; pps = cur_pps; } } else if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI)) { - uint32_t len = nalu_len[len_index++]; - srs_verbose("nalu len=%u", len); - SrsBuffer stream((char*)frame + frame_len, 4); + uint32_t len = nalu_lens[len_index++]; + SrsBuffer stream((char*)frame_buffer + frame_buffer_index, 4); stream.write_4bytes(len); - frame_len += 4; - memcpy(frame + frame_len, p, rtp_h264_header->nalu_offset[j].second); - frame_len += rtp_h264_header->nalu_offset[j].second; + frame_buffer_index += 4; + memcpy(frame_buffer + frame_buffer_index, p, rtp_h264_header->nalu_offset[j].second); + frame_buffer_index += rtp_h264_header->nalu_offset[j].second; } } else { if (frames[i][n]->rtp_payload_header->is_first_packet_of_frame) { - uint32_t len = nalu_len[len_index++]; - srs_verbose("nalu len=%u", len); - SrsBuffer stream((char*)frame + frame_len, 4); + uint32_t len = nalu_lens[len_index++]; + SrsBuffer stream((char*)frame_buffer + frame_buffer_index, 4); stream.write_4bytes(len); - frame_len += 4; - frame[frame_len++] = rtp_h264_header->nalu_header; + frame_buffer_index += 4; + frame_buffer[frame_buffer_index++] = rtp_h264_header->nalu_header; if ((rtp_h264_header->nalu_header & kNalTypeMask) == SrsAvcNaluTypeIDR) { - srs_verbose("idr"); idr = true; } } - memcpy(frame + frame_len, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, + memcpy(frame_buffer + frame_buffer_index, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, rtp_h264_header->nalu_offset[j].second); - frame_len += rtp_h264_header->nalu_offset[j].second; + frame_buffer_index += rtp_h264_header->nalu_offset[j].second; } } srs_freep(frames[i][n]); @@ -1735,7 +2011,7 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* stream->write_1bytes(0x00); stream->write_1bytes(0x00); - // NAL SIZE 61 76 63 43 01 42 C0 1E FF E1 SPS_LEN SPS 01 PPS_LEN PPS + // FIXME: Replace magic number. stream->write_1bytes(0x01); stream->write_1bytes(0x42); stream->write_1bytes(0xC0); @@ -1760,6 +2036,7 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* srs_error_t e = source->on_video(shared_video); if (e != srs_success) { srs_warn("on video header err=%s", srs_error_desc(e).c_str()); + srs_error_reset(e); } srs_verbose("rtp on video header"); @@ -1776,27 +2053,25 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* } if (idr) { - frame[0] = 0x17; + frame_buffer[0] = 0x17; } else { - frame[0] = 0x27; + frame_buffer[0] = 0x27; } - frame[1] = 0x01; - frame[2] = 0x00; - frame[3] = 0x00; - frame[4] = 0x00; + frame_buffer[1] = 0x01; + frame_buffer[2] = 0x00; + frame_buffer[3] = 0x00; + frame_buffer[4] = 0x00; SrsMessageHeader header; header.message_type = 9; header.timestamp = timestamp / 90; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); - shared_video->create(&header, reinterpret_cast(frame), frame_len); + shared_video->create(&header, reinterpret_cast(frame_buffer), frame_buffer_index); srs_error_t e = source->on_video(shared_video); if (e != srs_success) { srs_warn("on video err=%s", srs_error_desc(e).c_str()); } - - srs_verbose("rtp on video"); } } @@ -1866,6 +2141,14 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req strd->update_sendonly_socket(skt); } } + + if (rtc_publisher && rtc_publisher->sendonly_ukt) { + // We are running in the ice-lite(server) mode. If client have multi network interface, + // we only choose one candidate pair which is determined by client. + if (stun_req->get_use_candidate() && rtc_publisher->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { + rtc_publisher->update_sendonly_socket(skt); + } + } } return err; @@ -2079,69 +2362,7 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxS srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { - srs_error_t err = srs_success; - - /* - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |V=2|P|reserved | PT=XR=207 | length | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | SSRC | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - : report blocks : - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - - SrsBuffer stream(buf, nb_buf); - uint8_t first = stream.read_1bytes(); - uint8_t pt = stream.read_1bytes(); - uint16_t length = (stream.read_2bytes() + 1) * 4; - uint32_t ssrc = stream.read_4bytes(); - - if (length != nb_buf) { - return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet, length=%u, nb_buf=%d", length, nb_buf); - } - - while (stream.pos() + 4 < length) { - uint8_t bt = stream.read_1bytes(); - stream.skip(1); - uint16_t block_length = (stream.read_2bytes() + 1) * 4; - srs_verbose("XR, bt=%u", bt); - - if (stream.pos() + block_length - 4 > nb_buf) { - return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet block, block_length=%u, nb_buf=%d", block_length, nb_buf); - } - - if (bt == 5) { - for (int i = 4; i < block_length; i += 12) { - uint32_t ssrc = stream.read_4bytes(); - uint32_t lrr = stream.read_4bytes(); - uint32_t dlrr = stream.read_4bytes(); - - SrsNtp cur_ntp = SrsNtp::from_time_ms(srs_update_system_time()/1000); - uint32_t compact_ntp = (cur_ntp.ntp_second_ << 16) | (cur_ntp.ntp_fractions_ >> 16); - - int rtt_ntp = compact_ntp - lrr - dlrr; - int rtt = ((rtt_ntp * 1000) >> 16) + ((rtt_ntp >> 16) * 1000); - /* - lsr = (srs_ntp.ntp_second_ << 16) | (srs_ntp.ntp_fractions_ >> 16); - uint32_t dlsr = (srs_update_system_time() - ssrc_lsr[ssrc_of_sender]) / 1000; - rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); - */ - srs_verbose("ssrc=%u, compact_ntp=%u, lrr=%u, dlrr=%u, rtt=%d", - ssrc, compact_ntp, lrr, dlrr, rtt); - - if (ssrc == rtc_publisher->video_ssrc) { - rtc_publisher->rtp_video_queue->update_rtt(rtt); - } else if (ssrc == rtc_publisher->audio_ssrc) { - rtc_publisher->rtp_audio_queue->update_rtt(rtt); - } - } - } - } - - return err; + return rtc_publisher->on_rtcp_xr(buf, nb_buf, skt); } srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) @@ -2152,186 +2373,7 @@ srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMu return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtp sender report packet, nb_buf=%d", nb_buf); } - SrsBuffer* stream = new SrsBuffer(buf, nb_buf); - SrsAutoFree(SrsBuffer, stream); - - srs_verbose("SS=%s", srs_string_dumps_hex(buf, nb_buf).c_str()); - - // @see: https://tools.ietf.org/html/rfc3550#section-6.4.1 - /* - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -header |V=2|P| RC | PT=SR=200 | length | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | SSRC of sender | - +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -sender | NTP timestamp, most significant word | -info +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | NTP timestamp, least significant word | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | RTP timestamp | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | sender's packet count | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | sender's octet count | - +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -report | SSRC_1 (SSRC of first source) | -block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - 1 | fraction lost | cumulative number of packets lost | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | extended highest sequence number received | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | interarrival jitter | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | last SR (LSR) | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | delay since last SR (DLSR) | - +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -report | SSRC_2 (SSRC of second source) | -block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - 2 : ... : - +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ - | profile-specific extensions | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - uint8_t first = stream->read_1bytes(); - //uint8_t version = first & 0xC0; - //uint8_t padding = first & 0x20; - uint8_t rc = first & 0x1F; - - /*uint8_t payload_type = */stream->read_1bytes(); - uint16_t length = stream->read_2bytes(); - - if (((length + 1) * 4) != (rc * 24 + 28)) { - return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtcp sender report packet, length=%u, rc=%u", length, rc); - } - - uint32_t ssrc_of_sender = stream->read_4bytes(); - uint64_t ntp = stream->read_8bytes(); - SrsNtp srs_ntp = SrsNtp::to_time_ms(ntp); - uint32_t rtp_time = stream->read_4bytes(); - uint32_t sender_packet_count = stream->read_4bytes(); - uint32_t sender_octec_count = stream->read_4bytes(); - - SrsNtp cur_ntp = SrsNtp::from_time_ms(srs_update_system_time()/1000); - - srs_verbose("sender report, ssrc_of_sender=%u, ntp={%lu,%lu}, cur_ntp={%lu,%lu},rtp_time=%u, sender_packet_count=%u, sender_octec_count=%u", - ssrc_of_sender, srs_ntp.ntp_, srs_ntp.system_ms_, cur_ntp.ntp_, cur_ntp.system_ms_, rtp_time, sender_packet_count, sender_octec_count); - - for (int i = 0; i < rc; ++i) { - uint32_t ssrc = stream->read_4bytes(); - uint8_t fraction_lost = stream->read_1bytes(); - uint32_t cumulative_number_of_packets_lost = stream->read_3bytes(); - uint32_t highest_seq = stream->read_4bytes(); - uint32_t jitter = stream->read_4bytes(); - uint32_t lst = stream->read_4bytes(); - uint32_t dlsr = stream->read_4bytes(); - - (void)ssrc; (void)fraction_lost; (void)cumulative_number_of_packets_lost; (void)highest_seq; (void)jitter; (void)lst; (void)dlsr; - srs_verbose("sender report, ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, highest_seq=%u, jitter=%u, lst=%u, dlst=%u", - ssrc, fraction_lost, cumulative_number_of_packets_lost, highest_seq, jitter, lst, dlsr); - } - - static map ssrc_lsr; - - // Response RR - { - char buf[1024]; - SrsBuffer stream(buf, sizeof(buf)); - stream.write_1bytes(0x81); - stream.write_1bytes(kRR); - stream.write_2bytes(7); - stream.write_4bytes(ssrc_of_sender); - - SrsRtpQueue* rtp_queue = NULL; - string type = "unknown"; - if (ssrc_of_sender == rtc_publisher->video_ssrc) { - rtp_queue = rtc_publisher->rtp_video_queue; - type = "video"; - } else if (ssrc_of_sender == rtc_publisher->audio_ssrc) { - rtp_queue = rtc_publisher->rtp_audio_queue; - type = "audio"; - } - - uint8_t fraction_lost = rtp_queue->get_fraction_lost(); - uint32_t cumulative_number_of_packets_lost = rtp_queue->get_cumulative_number_of_packets_lost() & 0x7FFFFF; - uint32_t extended_highest_sequence = rtp_queue->get_extended_highest_sequence(); - uint32_t interarrival_jitter = rtp_queue->get_interarrival_jitter(); - - uint32_t lsr = 0; - uint32_t rr_dlsr = 0; - if (ssrc_lsr[ssrc_of_sender] > 0) { - lsr = (srs_ntp.ntp_second_ << 16) | (srs_ntp.ntp_fractions_ >> 16); - uint32_t dlsr = (srs_update_system_time() - ssrc_lsr[ssrc_of_sender]) / 1000; - rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); - } - - - stream.write_4bytes(ssrc_of_sender); - stream.write_1bytes(fraction_lost); - stream.write_3bytes(cumulative_number_of_packets_lost); - stream.write_4bytes(extended_highest_sequence); - stream.write_4bytes(interarrival_jitter); - stream.write_4bytes(lsr); - stream.write_4bytes(rr_dlsr); - - srs_verbose("RR type=%s, ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, extended_highest_sequence=%u, interarrival_jitter=%u", - type.c_str(), ssrc_of_sender, fraction_lost, cumulative_number_of_packets_lost, extended_highest_sequence, interarrival_jitter); - - char protected_buf[kRtpPacketSize]; - int nb_protected_buf = stream.pos(); - if (dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { - skt->sendto(protected_buf, nb_protected_buf, 0); - } - - // XR - { - /* - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |V=2|P|reserved | PT=XR=207 | length | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | SSRC | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - : report blocks : - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | BT=4 | reserved | block length = 2 | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | NTP timestamp, most significant word | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | NTP timestamp, least significant word | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - char buf[1024]; - SrsBuffer stream(buf, sizeof(buf)); - stream.write_1bytes(0x80); - stream.write_1bytes(kXR); - stream.write_2bytes(4); - stream.write_4bytes(ssrc_of_sender); - stream.write_1bytes(4); - stream.write_1bytes(0); - stream.write_2bytes(2); - stream.write_4bytes(cur_ntp.ntp_second_); - stream.write_4bytes(cur_ntp.ntp_fractions_); - ssrc_lxr[ssrc_of_sender] = srs_ntp.system_ms_; - //skt->sendto(stream.data(), stream.pos(), 0); - char protected_buf[kRtpPacketSize]; - int nb_protected_buf = stream.pos(); - if (dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { - skt->sendto(protected_buf, nb_protected_buf, 0); - } - } - } - - ssrc_lsr[ssrc_of_sender] = srs_update_system_time(); - - return err; + return rtc_publisher->on_rtcp_sender_report(buf, nb_buf, skt); } srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) @@ -2427,7 +2469,8 @@ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) } } - rtc_publisher->initialize(video_ssrc, audio_ssrc, request); + // FIXME: err process. + rtc_publisher->initialize(skt, video_ssrc, audio_ssrc, request); } srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 6f6d390f7..ff697e650 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -252,9 +252,12 @@ private: srs_error_t packet_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); }; -class SrsRtcPublisher +class SrsRtcPublisher : virtual public ISrsHourGlass { - friend class SrsRtcSession; +private: + SrsHourGlass* report_timer; +public: + SrsUdpMuxSocket* sendonly_ukt; private: SrsRtcSession* rtc_session; uint32_t video_ssrc; @@ -268,15 +271,32 @@ private: SrsSource* source; std::string sps; std::string pps; +private: + std::map last_sender_report_sys_time; + std::map last_sender_report_ntp; public: SrsRtcPublisher(SrsRtcSession* session); virtual ~SrsRtcPublisher(); public: - void initialize(uint32_t vssrc, uint32_t assrc, SrsRequest request); + srs_error_t initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest request); srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); + srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); + srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); +private: + void check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt); + srs_error_t send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue); + srs_error_t send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc); private: srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); +private: + srs_error_t collect_video_frame(); + srs_error_t collect_audio_frame(); +public: + void update_sendonly_socket(SrsUdpMuxSocket* skt); +// interface ISrsHourGlass +public: + virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); }; class SrsRtcSession diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 6e71b15cd..afe747795 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -38,7 +38,7 @@ struct SrsNackOption SrsNackOption() { // Default nack option. - max_count = 5; + max_count = 10; max_alive_time = 2 * SRS_UTIME_SECONDS; first_nack_interval = 10 * SRS_UTIME_MILLISECONDS; nack_interval = 400 * SRS_UTIME_MILLISECONDS; From 775065175a476d428f2ee2d5a6fcff513335bb43 Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Fri, 24 Apr 2020 00:06:59 +0800 Subject: [PATCH 07/79] rtc session distinguish play and publish --- trunk/src/app/srs_app_http_api.cpp | 22 ++++--- trunk/src/app/srs_app_rtc_conn.cpp | 94 ++++++++++++++++++++--------- trunk/src/app/srs_app_rtc_conn.hpp | 1 + trunk/src/app/srs_app_rtp_queue.cpp | 8 ++- 4 files changed, 84 insertions(+), 41 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 388420374..81e45183c 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1086,11 +1086,13 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_media_desc.rtcp_mux_ = true; local_media_desc.rtcp_rsize_ = true; - SrsSSRCInfo ssrc_info; - ssrc_info.ssrc_ = ++ssrc_num; - // TODO:use formated cname - ssrc_info.cname_ = "test_sdp_cname"; - local_media_desc.ssrc_infos_.push_back(ssrc_info); + if (local_media_desc.recvonly_ || local_media_desc.sendrecv_) { + SrsSSRCInfo ssrc_info; + ssrc_info.ssrc_ = ++ssrc_num; + // TODO:use formated cname + ssrc_info.cname_ = "test_sdp_cname"; + local_media_desc.ssrc_infos_.push_back(ssrc_info); + } } return err; @@ -1381,10 +1383,12 @@ srs_error_t SrsGoApiRtcPublish::exchange_sdp(const std::string& app, const std:: local_media_desc.rtcp_mux_ = true; - SrsSSRCInfo ssrc_info; - ssrc_info.ssrc_ = ++ssrc_num; - ssrc_info.cname_ = "test_sdp_cname"; - local_media_desc.ssrc_infos_.push_back(ssrc_info); + if (local_media_desc.recvonly_ || local_media_desc.sendrecv_) { + SrsSSRCInfo ssrc_info; + ssrc_info.ssrc_ = ++ssrc_num; + ssrc_info.cname_ = "test_sdp_cname"; + local_media_desc.ssrc_infos_.push_back(ssrc_info); + } } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index e228a2464..21e749c48 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1614,6 +1614,10 @@ srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdp { srs_error_t err = srs_success; + if (nb_buf < 28) { + return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtp sender report packet, nb_buf=%d", nb_buf); + } + SrsBuffer* stream = new SrsBuffer(buf, nb_buf); SrsAutoFree(SrsBuffer, stream); @@ -2100,7 +2104,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const // TODO: FIXME: Support reload. sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req.vhost); - rtc_publisher = new SrsRtcPublisher(this); + rtc_publisher = NULL; } SrsRtcSession::~SrsRtcSession() @@ -2362,6 +2366,10 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxS srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { + if (rtc_publisher == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); + } + return rtc_publisher->on_rtcp_xr(buf, nb_buf, skt); } @@ -2369,8 +2377,8 @@ srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMu { srs_error_t err = srs_success; - if (nb_buf < 28) { - return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtp sender report packet, nb_buf=%d", nb_buf); + if (rtc_publisher == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } return rtc_publisher->on_rtcp_sender_report(buf, nb_buf, skt); @@ -2447,34 +2455,25 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) { - // FIXME: - if (true) - { - uint32_t video_ssrc = 0; - uint32_t audio_ssrc = 0; - uint16_t video_payload_type = 0; - uint16_t audio_payload_type = 0; - for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { - const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; - if (media_desc.is_audio()) { - if (! media_desc.ssrc_infos_.empty()) { - audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; - audio_payload_type = media_desc.payload_types_[0].payload_type_; - } - } else if (media_desc.is_video()) { - if (! media_desc.ssrc_infos_.empty()) { - video_ssrc = media_desc.ssrc_infos_[0].ssrc_; - video_payload_type = media_desc.payload_types_[0].payload_type_; - } - } - } - - // FIXME: err process. - rtc_publisher->initialize(skt, video_ssrc, audio_ssrc, request); - } + srs_error_t err = srs_success; srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); - return start_play(skt); + + if (! local_sdp.media_descs_.empty() && + (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { + if ((err = start_publish(skt)) != srs_success) { + return srs_error_wrap(err, "start publish"); + } + } + + if (! local_sdp.media_descs_.empty() && + (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { + if ((err = start_play(skt)) != srs_success) { + return srs_error_wrap(err, "start play"); + } + } + + return err; } srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) @@ -2510,6 +2509,39 @@ srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) return err; } +srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) +{ + srs_error_t err = srs_success; + + rtc_publisher = new SrsRtcPublisher(this); + + uint32_t video_ssrc = 0; + uint32_t audio_ssrc = 0; + uint16_t video_payload_type = 0; + uint16_t audio_payload_type = 0; + for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { + const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; + if (media_desc.is_audio()) { + if (! media_desc.ssrc_infos_.empty()) { + audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; + audio_payload_type = media_desc.payload_types_[0].payload_type_; + } + } else if (media_desc.is_video()) { + if (! media_desc.ssrc_infos_.empty()) { + video_ssrc = media_desc.ssrc_infos_[0].ssrc_; + video_payload_type = media_desc.payload_types_[0].payload_type_; + } + } + } + + // FIXME: err process. + if ((err = rtc_publisher->initialize(skt, video_ssrc, audio_ssrc, request)) != srs_success) { + return srs_error_wrap(err, "rtc publisher init"); + } + + return err; +} + bool SrsRtcSession::is_stun_timeout() { return last_stun_time + sessionStunTimeout < srs_get_system_time(); @@ -2599,6 +2631,10 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; + if (rtc_publisher == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); + } + if (dtls_session == NULL) { return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index ff697e650..718d62d9e 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -358,6 +358,7 @@ public: srs_error_t send_client_hello(SrsUdpMuxSocket* skt); srs_error_t on_connection_established(SrsUdpMuxSocket* skt); srs_error_t start_play(SrsUdpMuxSocket* skt); + srs_error_t start_publish(SrsUdpMuxSocket* skt); public: bool is_stun_timeout(); private: diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 393c23263..74390314b 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -127,8 +127,8 @@ void SrsRtpNackList::get_nack_seqs(vector& seqs) void SrsRtpNackList::update_rtt(int rtt) { - rtt_ = rtt; - srs_verbose("NACK, update rtt from %ld to %d", opts_.nack_interval, rtt); + rtt_ = rtt * SRS_UTIME_MILLISECONDS; + srs_verbose("NACK, update rtt from %ld to %d", opts_.nack_interval, rtt_); // FIXME: limit min and max value. opts_.nack_interval = rtt_; } @@ -182,7 +182,9 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) } else { SrsRtpNackInfo* nack_info = NULL; if ((nack_info = nack_.find(seq)) != NULL) { - srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success", seq, now - nack_info->generate_time_, nack_info->req_nack_count_); + int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; + srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", + seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); nack_.remove(seq); } else { // Calc jitter. From 613baa561a15d58e7e737ffed5a33fd897dbe1b6 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 24 Apr 2020 09:42:15 +0800 Subject: [PATCH 08/79] Update script --- trunk/auto/depends.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 1103377d2..b6d6a644a 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -678,7 +678,10 @@ if [ $SRS_FFMPEG_TOOL = YES ]; then if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/ffmpeg/bin/ffmpeg ]]; then echo "ffmpeg-4.1 is ok."; else - echo "no ffmpeg found, please use srs-docker or --without-ffmpeg"; + echo "Error: no FFmpeg found at /usr/local/bin/ffmpeg"; + echo " please copy it from srs-docker"; + echo " or download from http://ffmpeg.org/download.html"; + echo " or disable it by --without-ffmpeg"; exit -1; fi # Always update the links. From 8dc0746e2dd9d41c100bd1eac8104fe57772461d Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Fri, 24 Apr 2020 16:19:08 +0800 Subject: [PATCH 09/79] rtc publish release --- trunk/src/app/srs_app_http_api.cpp | 4 +- trunk/src/app/srs_app_rtc.cpp | 31 +++++++++++-- trunk/src/app/srs_app_rtc.hpp | 9 ++++ trunk/src/app/srs_app_rtc_conn.cpp | 51 ++++++++++++++++----- trunk/src/app/srs_app_rtc_conn.hpp | 3 ++ trunk/src/app/srs_app_rtp_queue.cpp | 69 ++++++++++++++++++++--------- trunk/src/app/srs_app_rtp_queue.hpp | 12 +++-- trunk/src/app/srs_app_sdp.cpp | 5 ++- trunk/src/kernel/srs_kernel_rtp.cpp | 5 ++- trunk/src/kernel/srs_kernel_rtp.hpp | 1 + 10 files changed, 146 insertions(+), 44 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 81e45183c..694caf038 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1290,9 +1290,7 @@ srs_error_t SrsGoApiRtcPublish::exchange_sdp(const std::string& app, const std:: local_sdp.group_policy_ = "BUNDLE"; - int mid = 0; - - for (int i = 0; i < remote_sdp.media_descs_.size(); ++i) { + for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { const SrsMediaDesc& remote_media_desc = remote_sdp.media_descs_[i]; if (remote_media_desc.is_audio()) { diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp index 288f892e1..a038f3c02 100644 --- a/trunk/src/app/srs_app_rtc.cpp +++ b/trunk/src/app/srs_app_rtc.cpp @@ -238,16 +238,17 @@ srs_error_t SrsRtpH264Demuxer::parse(SrsRtpSharedPacket* rtp_pkt) } uint8_t nal_type = rtp_payload[0] & kNalTypeMask; + if (nal_type == SrsAvcNaluTypeIDR) { + rtp_h264_header->is_key_frame = true; + } if (nal_type >= 1 && nal_type <= 23) { - srs_verbose("seq=%u, single nalu", rtp_pkt->rtp_header.get_sequence()); rtp_h264_header->is_first_packet_of_frame = true; rtp_h264_header->is_last_packet_of_frame = true; rtp_h264_header->nalu_type = nal_type; rtp_h264_header->nalu_header = rtp_payload[0]; rtp_h264_header->nalu_offset.push_back(make_pair(0, rtp_payload_size)); } else if (nal_type == kFuA) { - srs_verbose("seq=%u, fu-a", rtp_pkt->rtp_header.get_sequence()); if ((rtp_payload[1] & kStart)) { rtp_h264_header->is_first_packet_of_frame = true; } @@ -258,13 +259,11 @@ srs_error_t SrsRtpH264Demuxer::parse(SrsRtpSharedPacket* rtp_pkt) rtp_h264_header->nalu_header = (rtp_payload[0] & (~kNalTypeMask)) | (rtp_payload[1] & kNalTypeMask); rtp_h264_header->nalu_offset.push_back(make_pair(2, rtp_payload_size - 2)); } else if (nal_type == kStapA) { - srs_verbose("seq=%u, stap-a", rtp_pkt->rtp_header.get_sequence()); int i = 1; rtp_h264_header->is_first_packet_of_frame = true; rtp_h264_header->is_last_packet_of_frame = true; rtp_h264_header->nalu_type = nal_type; while (i < rtp_payload_size) { - srs_verbose("stap-a cur index=%s", srs_string_dumps_hex(reinterpret_cast(rtp_payload + i), 2).c_str()); uint16_t nal_len = (rtp_payload[i]) << 8 | rtp_payload[i + 1]; if (nal_len > rtp_payload_size - i) { return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid stap-a packet, nal len=%u, i=%d, rtp_payload_size=%d", nal_len, i, rtp_payload_size); @@ -286,6 +285,30 @@ srs_error_t SrsRtpH264Demuxer::parse(SrsRtpSharedPacket* rtp_pkt) return err; } +SrsRtpOpusDemuxer::SrsRtpOpusDemuxer() +{ +} + +SrsRtpOpusDemuxer::~SrsRtpOpusDemuxer() +{ +} + +srs_error_t SrsRtpOpusDemuxer::parse(SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + + SrsRtpOpusHeader* rtp_opus_header = dynamic_cast(rtp_pkt->rtp_payload_header); + if (rtp_opus_header == NULL) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid rtp packet"); + } + + rtp_opus_header->is_first_packet_of_frame = true; + rtp_opus_header->is_last_packet_of_frame = true; + rtp_opus_header->is_key_frame = true; + + return err; +} + SrsRtc::SrsRtc() { req = NULL; diff --git a/trunk/src/app/srs_app_rtc.hpp b/trunk/src/app/srs_app_rtc.hpp index 7c22e04dd..99db8bd78 100644 --- a/trunk/src/app/srs_app_rtc.hpp +++ b/trunk/src/app/srs_app_rtc.hpp @@ -87,6 +87,15 @@ public: srs_error_t parse(SrsRtpSharedPacket* rtp_pkt); }; +class SrsRtpOpusDemuxer +{ +public: + SrsRtpOpusDemuxer(); + virtual ~SrsRtpOpusDemuxer(); +public: + srs_error_t parse(SrsRtpSharedPacket* rtp_pkt); +}; + class SrsRtc { private: diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 21e749c48..4b43f5444 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1495,6 +1495,7 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) rtc_session = session; rtp_h264_demuxer = new SrsRtpH264Demuxer(); + rtp_opus_demuxer = new SrsRtpOpusDemuxer(); rtp_video_queue = new SrsRtpQueue(1000); rtp_audio_queue = new SrsRtpQueue(100, true); @@ -1505,6 +1506,7 @@ SrsRtcPublisher::~SrsRtcPublisher() { srs_freep(report_timer); srs_freep(rtp_h264_demuxer); + srs_freep(rtp_opus_demuxer); srs_freep(rtp_video_queue); srs_freep(rtp_audio_queue); } @@ -1718,10 +1720,11 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* */ SrsBuffer stream(buf, nb_buf); - uint8_t first = stream.read_1bytes(); + /*uint8_t first = */stream.read_1bytes(); uint8_t pt = stream.read_1bytes(); + srs_assert(pt == kXR); uint16_t length = (stream.read_2bytes() + 1) * 4; - uint32_t ssrc = stream.read_4bytes(); + /*uint32_t ssrc = */stream.read_4bytes(); if (length != nb_buf) { return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid XR packet, length=%u, nb_buf=%d", length, nb_buf); @@ -1865,18 +1868,46 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ss return err; } +srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc) +{ + srs_error_t err = srs_success; + + char buf[kRtpPacketSize]; + SrsBuffer stream(buf, sizeof(buf)); + stream.write_1bytes(0x81); + stream.write_1bytes(kPsFb); + stream.write_2bytes(2); + stream.write_4bytes(ssrc); + stream.write_4bytes(ssrc); + + srs_verbose("PLI ssrc=%u", ssrc); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + return srs_error_wrap(err, "protect rtcp psfb pli"); + } + + skt->sendto(protected_buf, nb_protected_buf, 0); + + return err; +} srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) { srs_error_t err = srs_success; - rtp_pkt->rtp_payload_header = new SrsRtpOpusHeader(); - rtp_pkt->rtp_payload_header->is_first_packet_of_frame = true; - rtp_pkt->rtp_payload_header->is_last_packet_of_frame = true; + if ((err = rtp_opus_demuxer->parse(rtp_pkt)) != srs_success) { + return srs_error_wrap(err, "rtp opus demux failed"); + } rtp_audio_queue->insert(rtp_pkt); + if (rtp_audio_queue->get_and_clean_if_needed_rqeuest_key_frame()) { + send_rtcp_fb_pli(skt, audio_ssrc); + } + check_send_nacks(rtp_audio_queue, audio_ssrc, skt); return collect_audio_frame(); @@ -1915,6 +1946,10 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_video_queue->insert(rtp_pkt); + if (rtp_video_queue->get_and_clean_if_needed_rqeuest_key_frame()) { + send_rtcp_fb_pli(skt, video_ssrc); + } + check_send_nacks(rtp_video_queue, video_ssrc, skt); return collect_video_frame(); @@ -2375,8 +2410,6 @@ srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* sk srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { - srs_error_t err = srs_success; - if (rtc_publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } @@ -2517,19 +2550,15 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; - uint16_t video_payload_type = 0; - uint16_t audio_payload_type = 0; for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; if (media_desc.is_audio()) { if (! media_desc.ssrc_infos_.empty()) { audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; - audio_payload_type = media_desc.payload_types_[0].payload_type_; } } else if (media_desc.is_video()) { if (! media_desc.ssrc_infos_.empty()) { video_ssrc = media_desc.ssrc_infos_[0].ssrc_; - video_payload_type = media_desc.payload_types_[0].payload_type_; } } } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 718d62d9e..1a1630d17 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -53,6 +53,7 @@ class SrsRtpPacket2; class ISrsUdpSender; class SrsRtpQueue; class SrsRtpH264Demuxer; +class SrsRtpOpusDemuxer; const uint8_t kSR = 200; const uint8_t kRR = 201; @@ -264,6 +265,7 @@ private: uint32_t audio_ssrc; private: SrsRtpH264Demuxer* rtp_h264_demuxer; + SrsRtpOpusDemuxer* rtp_opus_demuxer; SrsRtpQueue* rtp_video_queue; SrsRtpQueue* rtp_audio_queue; private: @@ -286,6 +288,7 @@ private: void check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt); srs_error_t send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue); srs_error_t send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc); + srs_error_t send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc); private: srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 74390314b..47f8587a9 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -41,13 +41,14 @@ SrsRtpNackInfo::SrsRtpNackInfo() req_nack_count_ = 0; } -SrsRtpNackList::SrsRtpNackList(SrsRtpQueue* rtp_queue) +SrsRtpNackList::SrsRtpNackList(SrsRtpQueue* rtp_queue, size_t queue_size) { + max_queue_size_ = queue_size; rtp_queue_ = rtp_queue; pre_check_time_ = 0; - srs_info("nack opt: max_count=%d, max_alive_time=%us, first_nack_interval=%ld, nack_interval=%ld" - opts_.max_count, opts_.max_alive_time, opts.first_nack_interval, opts_.nack_interval); + srs_info("max_queue_size=%u, nack opt: max_count=%d, max_alive_time=%us, first_nack_interval=%ld, nack_interval=%ld" + max_queue_size_, opts_.max_count, opts_.max_alive_time, opts.first_nack_interval, opts_.nack_interval); } SrsRtpNackList::~SrsRtpNackList() @@ -58,6 +59,7 @@ void SrsRtpNackList::insert(uint16_t seq) { // FIXME: full, drop packet, and request key frame. SrsRtpNackInfo& nack_info = queue_[seq]; + (void)nack_info; } void SrsRtpNackList::remove(uint16_t seq) @@ -76,12 +78,11 @@ SrsRtpNackInfo* SrsRtpNackList::find(uint16_t seq) return &(iter->second); } -void SrsRtpNackList::dump() +void SrsRtpNackList::check_queue_size() { - return; - srs_verbose("@debug, queue size=%u", queue_.size()); - for (std::map::iterator iter = queue_.begin(); iter != queue_.end(); ++iter) { - srs_verbose("@debug, nack seq=%u", iter->first); + if (queue_.size() >= max_queue_size_) { + srs_verbose("NACK list full, queue size=%u, max_queue_size=%u", queue_.size(), max_queue_size_); + rtp_queue_->notify_nack_list_full(); } } @@ -134,7 +135,7 @@ void SrsRtpNackList::update_rtt(int rtt) } SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) - : nack_(this) + : nack_(this, capacity * 2 / 3) { capacity_ = capacity; head_sequence_ = 0; @@ -155,6 +156,8 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) number_of_packet_lossed_ = 0; one_packet_per_frame_ = one_packet_per_frame; + + request_key_frame_ = false; } SrsRtpQueue::~SrsRtpQueue() @@ -189,7 +192,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) } else { // Calc jitter. { - int trans_time = now/1000 - rtp_pkt->rtp_header.get_timestamp()/90; + int trans_time = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; int cur_jitter = trans_time - last_trans_time_; if (cur_jitter < 0) { @@ -214,7 +217,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) highest_sequence_ = seq; } else { // Because we don't know the ISN(initiazlie sequence number), the first packet - // we received maybe no the first paacet client sented. + // we received maybe no the first packet client sented. if (! start_collected_) { if (seq_cmp(seq, head_sequence_)) { srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", head_sequence_, seq); @@ -228,9 +231,6 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) } } - int delay = highest_sequence_ - head_sequence_ + 1; - srs_verbose("seqs range=[%u-%u], delay=%d", head_sequence_, highest_sequence_, delay); - // Check seqs out of range. if (head_sequence_ + capacity_ < highest_sequence_) { srs_verbose("try collect packet becuase seq out of range"); @@ -261,12 +261,12 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) head_sequence_ = s; } - SrsRtpSharedPacket* old_pkt = queue_[seq % capacity_]; + SrsRtpSharedPacket*& old_pkt = queue_[seq % capacity_]; if (old_pkt) { delete old_pkt; } - queue_[seq % capacity_] = rtp_pkt->copy(); + old_pkt = rtp_pkt->copy(); // Marker bit means the last packet of frame received. if (rtp_pkt->rtp_header.get_marker() || (highest_sequence_ - head_sequence_ >= capacity_ / 2) || one_packet_per_frame_) { @@ -294,6 +294,15 @@ void SrsRtpQueue::get_and_clean_collected_frames(std::vectorrtp_payload_header->is_key_frame && pkt->rtp_payload_header->is_first_packet_of_frame) { + found_key_frame = true; + srs_verbose("found firsr packet of key frame, seq=%u", head_sequence_); + break; + } + + nack_.remove(head_sequence_); + remove(head_sequence_); + ++head_sequence_; + } + + if (! found_key_frame) { + srs_verbose("no found first packet of key frame, request key frame"); + request_key_frame_ = true; + head_sequence_ = highest_sequence_; + } +} + uint32_t SrsRtpQueue::get_extended_highest_sequence() { return cycle_ * 65536 + highest_sequence_; @@ -350,8 +382,7 @@ void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) ++number_of_packet_lossed_; } - // FIXME: Record key frame sequence. - // FIXME: When nack list too long, clear and send PLI. + nack_.check_queue_size(); } void SrsRtpQueue::collect_packet() @@ -360,8 +391,6 @@ void SrsRtpQueue::collect_packet() for (uint16_t s = head_sequence_; s != highest_sequence_; ++s) { SrsRtpSharedPacket* pkt = queue_[s % capacity_]; - nack_.dump(); - if (nack_.find(s) != NULL) { srs_verbose("seq=%u, found in nack list when collect frame", s); break; diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index afe747795..f8a31d08f 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -79,6 +79,8 @@ class SrsRtpNackList private: // Nack queue, seq order, oldest to newest. std::map queue_; + // Max nack count. + size_t max_queue_size_; SrsRtpQueue* rtp_queue_; SrsNackOption opts_; private: @@ -86,14 +88,13 @@ private: private: int rtt_; public: - SrsRtpNackList(SrsRtpQueue* rtp_queue); + SrsRtpNackList(SrsRtpQueue* rtp_queue, size_t queue_size); virtual ~SrsRtpNackList(); public: void insert(uint16_t seq); void remove(uint16_t seq); SrsRtpNackInfo* find(uint16_t seq); -public: - void dump(); + void check_queue_size(); public: void get_nack_seqs(std::vector& seqs); public: @@ -109,7 +110,7 @@ private: * \___(no received, in nack list) */ // Capacity of the ring-buffer. - size_t capacity_; + uint16_t capacity_; // Thei highest sequence we have receive. uint16_t highest_sequence_; // The sequence waitting to read. @@ -132,6 +133,7 @@ public: SrsRtpNackList nack_; private: std::vector > frames_; + bool request_key_frame_; public: SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); virtual ~SrsRtpQueue(); @@ -140,7 +142,9 @@ public: srs_error_t remove(uint16_t seq); public: void get_and_clean_collected_frames(std::vector >& frames); + bool get_and_clean_if_needed_rqeuest_key_frame(); void notify_drop_seq(uint16_t seq); + void notify_nack_list_full(); public: uint32_t get_extended_highest_sequence(); uint8_t get_fraction_lost(); diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index 7b89e0ce6..da4e8226a 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -225,7 +225,10 @@ srs_error_t SrsMediaPayloadType::encode(std::ostringstream& os) } if (! format_specific_param_.empty()) { - os << "a=fmtp:" << payload_type_ << " " << format_specific_param_ << kCRLF; + os << "a=fmtp:" << payload_type_ << " " << format_specific_param_ + // FIXME:test code. + << ";x-google-max-bitrate=6000;x-google-min-bitrate=5100;x-google-start-bitrate=5000" + << kCRLF; } return err; diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index daf73ac32..eb1938a87 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -97,7 +97,7 @@ srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) timestamp = stream->read_4bytes(); ssrc = stream->read_4bytes(); - if (stream->size() < header_size()) { + if ((size_t)stream->size() < header_size()) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } @@ -610,6 +610,7 @@ SrsRtpPayloadHeader::SrsRtpPayloadHeader() { is_first_packet_of_frame = false; is_last_packet_of_frame = false; + is_key_frame = false; } SrsRtpPayloadHeader::~SrsRtpPayloadHeader() @@ -625,6 +626,8 @@ SrsRtpPayloadHeader& SrsRtpPayloadHeader::operator=(const SrsRtpPayloadHeader& r { is_first_packet_of_frame = rhs.is_first_packet_of_frame; is_last_packet_of_frame = rhs.is_last_packet_of_frame; + + return *this; } SrsRtpH264Header::SrsRtpH264Header() : SrsRtpPayloadHeader() diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index 2ad222bee..42fda10c0 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -231,6 +231,7 @@ class SrsRtpPayloadHeader public: bool is_first_packet_of_frame; bool is_last_packet_of_frame; + bool is_key_frame; public: SrsRtpPayloadHeader(); virtual ~SrsRtpPayloadHeader(); From bb9367f88ac6cc1426644a6112a2b105c9754e6f Mon Sep 17 00:00:00 2001 From: xiaozhihong Date: Fri, 24 Apr 2020 16:22:08 +0800 Subject: [PATCH 10/79] add rtc_publisher.html --- trunk/research/players/rtc_publisher.html | 167 ++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 trunk/research/players/rtc_publisher.html diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html new file mode 100644 index 000000000..155c9f7fe --- /dev/null +++ b/trunk/research/players/rtc_publisher.html @@ -0,0 +1,167 @@ + + + + + + + + +local_media_player:
+
+rtc_media_player:
+ + + + + + + From 70a81b397065cf201c5447f41d8e54c6bd2124c5 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Apr 2020 18:59:02 +0800 Subject: [PATCH 11/79] Fix the bug for RTC publisher --- trunk/src/app/srs_app_http_api.cpp | 7 +++---- trunk/src/app/srs_app_rtc_conn.cpp | 27 +++++++++++++++++++++++++++ trunk/src/app/srs_app_sdp.cpp | 4 ++-- trunk/src/kernel/srs_kernel_error.hpp | 1 + 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 694caf038..a2cb67a52 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -841,7 +841,7 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe SrsJsonAny* json = SrsJsonAny::loads(req_json); if (!json || !json->is_object()) { - return srs_error_wrap(err, "not json"); + return srs_error_new(ERROR_RTC_API_BODY, "invalid body %s", req_json.c_str()); } req = json->to_object(); @@ -1021,7 +1021,6 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str if (local_media_desc.payload_types_.empty()) { return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no found valid opus payload type"); } - } else if (remote_media_desc.is_video()) { std::deque backup_payloads; std::vector payloads = remote_media_desc.find_media_with_encoding_name("H264"); @@ -1086,7 +1085,7 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_media_desc.rtcp_mux_ = true; local_media_desc.rtcp_rsize_ = true; - if (local_media_desc.recvonly_ || local_media_desc.sendrecv_) { + if (local_media_desc.sendonly_ || local_media_desc.sendrecv_) { SrsSSRCInfo ssrc_info; ssrc_info.ssrc_ = ++ssrc_num; // TODO:use formated cname @@ -1152,7 +1151,7 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt SrsJsonAny* json = SrsJsonAny::loads(req_json); if (!json || !json->is_object()) { - return srs_error_wrap(err, "not json"); + return srs_error_new(ERROR_RTC_API_BODY, "invalid body %s", req_json.c_str()); } req = json->to_object(); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 4b43f5444..3cf1082ce 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1578,6 +1578,11 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt) { + // If DTLS is not OK, drop all messages. + if (!rtc_session->dtls_session) { + return; + } + vector nack_seqs; rtp_queue->nack_.get_nack_seqs(nack_seqs); vector::iterator iter = nack_seqs.begin(); @@ -1605,6 +1610,7 @@ void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, Sr // FIXME: Merge nack rtcp into one packets. if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + // TODO: FIXME: Check error. skt->sendto(protected_buf, nb_protected_buf, 0); } @@ -1769,6 +1775,11 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S { srs_error_t err = srs_success; + // If DTLS is not OK, drop all messages. + if (!rtc_session->dtls_session) { + return err; + } + char buf[kRtpPacketSize]; SrsBuffer stream(buf, sizeof(buf)); stream.write_1bytes(0x81); @@ -1810,6 +1821,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S return srs_error_wrap(err, "protect rtcp rr"); } + // TDOO: FIXME: Check error. skt->sendto(protected_buf, nb_protected_buf, 0); return err; } @@ -1817,6 +1829,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc) { srs_error_t err = srs_success; + + // If DTLS is not OK, drop all messages. + if (!rtc_session->dtls_session) { + return err; + } + /* @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-2 @@ -1863,6 +1881,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ss return srs_error_wrap(err, "protect rtcp xr"); } + // TDOO: FIXME: Check error. skt->sendto(protected_buf, nb_protected_buf, 0); return err; @@ -1872,6 +1891,11 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr { srs_error_t err = srs_success; + // If DTLS is not OK, drop all messages. + if (!rtc_session->dtls_session) { + return err; + } + char buf[kRtpPacketSize]; SrsBuffer stream(buf, sizeof(buf)); stream.write_1bytes(0x81); @@ -1888,6 +1912,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr return srs_error_wrap(err, "protect rtcp psfb pli"); } + // TDOO: FIXME: Check error. skt->sendto(protected_buf, nb_protected_buf, 0); return err; @@ -2123,6 +2148,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const rtc_server = rtc_svr; session_state = INIT; dtls_session = new SrsDtlsSession(this); + // TODO: FIXME: Check error. dtls_session->initialize(req); strd = NULL; @@ -2344,6 +2370,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock srs_verbose("resend pkt sequence=%u", resend_pkts[i]->rtp_header.get_sequence()); + // TODO: FIXME: Check error. dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); skt->sendto(protected_buf, nb_protected_buf, 0); } diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index da4e8226a..dee3e8286 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -226,8 +226,8 @@ srs_error_t SrsMediaPayloadType::encode(std::ostringstream& os) if (! format_specific_param_.empty()) { os << "a=fmtp:" << payload_type_ << " " << format_specific_param_ - // FIXME:test code. - << ";x-google-max-bitrate=6000;x-google-min-bitrate=5100;x-google-start-bitrate=5000" + // TODO: FIXME: Remove the test code bellow. + // << ";x-google-max-bitrate=6000;x-google-min-bitrate=5100;x-google-start-bitrate=5000" << kCRLF; } diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp index ed41db1ba..2e6f57532 100644 --- a/trunk/src/kernel/srs_kernel_error.hpp +++ b/trunk/src/kernel/srs_kernel_error.hpp @@ -347,6 +347,7 @@ #define ERROR_RTC_RTCP_CHECK 5016 #define ERROR_RTC_SOURCE_CHECK 5017 #define ERROR_RTC_SDP_EXCHANGE 5018 +#define ERROR_RTC_API_BODY 5019 /////////////////////////////////////////////////////// // GB28181 API error. From cd3c15ec4e4c5d4a9b66d3ee0c5dc81625ce20b0 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Apr 2020 20:32:37 +0800 Subject: [PATCH 12/79] Support RTC publisher. --- trunk/research/players/js/srs.page.js | 1 + trunk/research/players/rtc_player.html | 8 +- trunk/research/players/rtc_publisher.html | 210 ++++++++++++++++------ trunk/research/players/srs_bwt.html | 1 + trunk/research/players/srs_chat.html | 1 + trunk/research/players/srs_gb28181.html | 1 + trunk/research/players/srs_player.html | 1 + trunk/research/players/srs_publisher.html | 1 + trunk/research/players/vlc.html | 1 + trunk/src/app/srs_app_http_api.cpp | 7 + 10 files changed, 170 insertions(+), 62 deletions(-) diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 3f3b1f6ca..6da6d4440 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -30,6 +30,7 @@ function update_nav() { $("#srs_index").attr("href", "index.html" + window.location.search); $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search); $("#nav_rtc_player").attr("href", "rtc_player.html" + window.location.search); + $("#nav_rtc_publisher").attr("href", "rtc_publisher.html" + window.location.search); $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search); $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search); $("#nav_srs_bwt").attr("href", "srs_bwt.html" + window.location.search); diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index e531aa434..c78fcdb5b 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -15,7 +15,7 @@ - +
@@ -24,6 +24,7 @@
  • SRS播放器
  • RTC播放器
    • +
  • RTC推流
    • @@ -67,6 +68,7 @@ pc = new RTCPeerConnection(null); pc.onaddstream = function (event) { + console.log('Start play, event: ', event); $('#rtc_media_player').prop('srcObject', event.stream); }; new Promise(function(resolve, reject) { @@ -103,13 +105,13 @@ var data = { api: url, streamurl: urlObject.url, clientip: null, sdp: offer.sdp }; - console.log("offer: " + JSON.stringify(data)); + console.log("Generated offer: ", data); $.ajax({ type: "POST", url: url, data: JSON.stringify(data), contentType:'application/json', dataType: 'json' }).done(function(data) { - console.log("answer: " + JSON.stringify(data)); + console.log("Got answer: ", data); resolve(data.sdp); }).fail(function(reason){ reject(reason); diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 155c9f7fe..75387ca78 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -1,23 +1,160 @@ - + - + SRS + + + + + + + - + +
    +
    +
    + SRS +
    + +
    +
    +
    +
    +
    +
    + URL: + + +
    -local_media_player:
    -
    -rtc_media_player:
    - + + + +
    + + diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index 408516d9c..07b1ca8b5 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -24,6 +24,7 @@
    • SRS播放器
    • RTC播放器
      • +
    • RTC推流
    • SRS编码器
    • SRS会议
    • SRS测网速
      • diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index 6591c1492..aedc4c71e 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -23,6 +23,7 @@
      • SRS播放器
      • RTC播放器
        • +
      • RTC推流
      • SRS编码器
      • SRS会议
      • SRS测网速
        • diff --git a/trunk/research/players/srs_gb28181.html b/trunk/research/players/srs_gb28181.html index 702cf8473..10ca8d967 100644 --- a/trunk/research/players/srs_gb28181.html +++ b/trunk/research/players/srs_gb28181.html @@ -37,6 +37,7 @@
        • SRS播放器
        • RTC播放器
          • +
        • RTC推流
          • diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 84b78b5c8..53e454c72 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -34,6 +34,7 @@
          • SRS播放器
          • RTC播放器
            • +
          • RTC推流
            • diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html index e07467b17..c3c33a1a0 100644 --- a/trunk/research/players/srs_publisher.html +++ b/trunk/research/players/srs_publisher.html @@ -23,6 +23,7 @@
            • SRS播放器
            • RTC播放器
              • +
            • RTC推流
            • SRS编码器
            • SRS会议
            • SRS测网速
              • diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html index 8dbf5e47c..ebb49dd84 100644 --- a/trunk/research/players/vlc.html +++ b/trunk/research/players/vlc.html @@ -20,6 +20,7 @@
              • SRS播放器
              • RTC播放器
                • +
              • RTC推流
              • SRS编码器
              • SRS会议
              • SRS测网速
                • diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index a2cb67a52..318888c8c 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1213,6 +1213,13 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt request.app = app; request.stream = stream_name; + // TODO: FIXME: Parse vhost. + // discovery vhost, resolve the vhost from config + SrsConfDirective* parsed_vhost = _srs_config->get_vhost(""); + if (parsed_vhost) { + request.vhost = parsed_vhost->arg0(); + } + // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. SrsRtcSession* rtc_session = rtc_server->create_rtc_session(request, remote_sdp, local_sdp, ""); From ebdc03416a73adf76cc70550019d98a476f98e05 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Apr 2020 22:30:55 +0800 Subject: [PATCH 13/79] Free rtc publish. Refactor TAB to spaces --- trunk/research/players/rtc_publisher.html | 107 ---------------------- trunk/src/app/srs_app_rtc.cpp | 2 +- trunk/src/app/srs_app_rtc_conn.cpp | 76 ++++++++------- trunk/src/app/srs_app_rtc_conn.hpp | 4 +- trunk/src/app/srs_app_sdp.cpp | 8 +- trunk/src/kernel/srs_kernel_rtp.cpp | 4 +- 6 files changed, 46 insertions(+), 155 deletions(-) diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 75387ca78..c8206ed79 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -149,111 +149,4 @@ - - diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp index a038f3c02..94e833078 100644 --- a/trunk/src/app/srs_app_rtc.cpp +++ b/trunk/src/app/srs_app_rtc.cpp @@ -373,7 +373,7 @@ srs_error_t SrsRtc::on_publish() return err; } - if (!_srs_config->get_rtc_enabled(req->vhost)) { + if (!_srs_config->get_rtc_enabled(req->vhost)) { return err; } diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 3cf1082ce..33afa2455 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1559,7 +1559,7 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) { srs_error_t err = srs_success; - SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); + SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); SrsAutoFree(SrsRtpSharedPacket, rtp_shared_pkt); if ((err = rtp_shared_pkt->decode(buf, nb_buf)) != srs_success) { return srs_error_wrap(err, "rtp packet decode failed"); @@ -1631,7 +1631,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdp // @see: https://tools.ietf.org/html/rfc3550#section-6.4.1 /* - 0 1 2 3 + 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ header |V=2|P| RC | PT=SR=200 | length | @@ -1714,7 +1714,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* /* @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-2 - 0 1 2 3 + 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |V=2|P|reserved | PT=XR=207 | length | @@ -1838,7 +1838,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ss /* @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-2 - 0 1 2 3 + 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |V=2|P|reserved | PT=XR=207 | length | @@ -1850,15 +1850,15 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ss @see: http://www.rfc-editor.org/rfc/rfc3611.html#section-4.4 - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | BT=4 | reserved | block length = 2 | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | NTP timestamp, most significant word | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | NTP timestamp, least significant word | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | BT=4 | reserved | block length = 2 | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, most significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | NTP timestamp, least significant word | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ srs_utime_t now = srs_update_system_time(); SrsNtp cur_ntp = SrsNtp::from_time_ms(now / 1000); @@ -2150,7 +2150,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const dtls_session = new SrsDtlsSession(this); // TODO: FIXME: Check error. dtls_session->initialize(req); - strd = NULL; + sender = NULL; username = un; @@ -2165,17 +2165,14 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const // TODO: FIXME: Support reload. sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req.vhost); - rtc_publisher = NULL; + publisher = NULL; } SrsRtcSession::~SrsRtcSession() { + srs_freep(sender); + srs_freep(publisher); srs_freep(dtls_session); - - if (strd) { - strd->stop(); - } - srs_freep(strd); } void SrsRtcSession::set_local_sdp(const SrsSdp& sdp) @@ -2199,19 +2196,19 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req last_stun_time = srs_get_system_time(); - if (strd && strd->sendonly_ukt) { + if (sender && sender->sendonly_ukt) { // We are running in the ice-lite(server) mode. If client have multi network interface, // we only choose one candidate pair which is determined by client. - if (stun_req->get_use_candidate() && strd->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { - strd->update_sendonly_socket(skt); + if (stun_req->get_use_candidate() && sender->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { + sender->update_sendonly_socket(skt); } } - if (rtc_publisher && rtc_publisher->sendonly_ukt) { + if (publisher && publisher->sendonly_ukt) { // We are running in the ice-lite(server) mode. If client have multi network interface, // we only choose one candidate pair which is determined by client. - if (stun_req->get_use_candidate() && rtc_publisher->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { - rtc_publisher->update_sendonly_socket(skt); + if (stun_req->get_use_candidate() && publisher->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { + publisher->update_sendonly_socket(skt); } } } @@ -2428,20 +2425,20 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxS srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { - if (rtc_publisher == NULL) { + if (publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return rtc_publisher->on_rtcp_xr(buf, nb_buf, skt); + return publisher->on_rtcp_xr(buf, nb_buf, skt); } srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { - if (rtc_publisher == NULL) { + if (publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return rtc_publisher->on_rtcp_sender_report(buf, nb_buf, skt); + return publisher->on_rtcp_sender_report(buf, nb_buf, skt); } srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) @@ -2540,8 +2537,8 @@ srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; - srs_freep(strd); - strd = new SrsRtcSenderThread(this, skt, _srs_context->get_id()); + srs_freep(sender); + sender = new SrsRtcSenderThread(this, skt, _srs_context->get_id()); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2558,11 +2555,11 @@ srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) } } - if ((err =strd->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { + if ((err = sender->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { return srs_error_wrap(err, "SrsRtcSenderThread init"); } - if ((err = strd->start()) != srs_success) { + if ((err = sender->start()) != srs_success) { return srs_error_wrap(err, "start SrsRtcSenderThread"); } @@ -2573,7 +2570,8 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; - rtc_publisher = new SrsRtcPublisher(this); + srs_freep(publisher); + publisher = new SrsRtcPublisher(this); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2591,7 +2589,7 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) } // FIXME: err process. - if ((err = rtc_publisher->initialize(skt, video_ssrc, audio_ssrc, request)) != srs_success) { + if ((err = publisher->initialize(skt, video_ssrc, audio_ssrc, request)) != srs_success) { return srs_error_wrap(err, "rtc publisher init"); } @@ -2662,7 +2660,7 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) err = on_rtcp_ps_feedback(ph, length, skt); break; } - case kXR: { + case kXR: { err = on_rtcp_xr(ph, length, skt); break; } @@ -2687,7 +2685,7 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; - if (rtc_publisher == NULL) { + if (publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } @@ -2701,7 +2699,7 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) return srs_error_wrap(err, "rtp unprotect failed"); } - return rtc_publisher->on_rtp(skt, unprotected_buf, nb_unprotected_buf); + return publisher->on_rtp(skt, unprotected_buf, nb_unprotected_buf); } SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 1a1630d17..60e63f1ee 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -312,7 +312,7 @@ private: SrsSdp local_sdp; SrsRtcSessionStateType session_state; SrsDtlsSession* dtls_session; - SrsRtcSenderThread* strd; + SrsRtcSenderThread* sender; std::string username; std::string peer_id; srs_utime_t last_stun_time; @@ -330,7 +330,7 @@ public: SrsRequest request; SrsSource* source; private: - SrsRtcPublisher* rtc_publisher; + SrsRtcPublisher* publisher; public: SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id); virtual ~SrsRtcSession(); diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index dee3e8286..4cce5295a 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -143,7 +143,7 @@ srs_error_t SrsSessionInfo::encode(std::ostringstream& os) if (! ice_options_.empty()) { os << "a=ice-options:" << ice_options_ << kCRLF; } else { - // @see: https://webrtcglossary.com/trickle-ice/ + // @see: https://webrtcglossary.com/trickle-ice/ // Trickle ICE is an optimization of the ICE specification for NAT traversal. os << "a=ice-options:trickle" << kCRLF; } @@ -362,7 +362,7 @@ srs_error_t SrsMediaDesc::encode(std::ostringstream& os) int foundation = 0; int component_id = 1; /* RTP */ - for (std::vector::iterator iter = candidates_.begin(); iter != candidates_.end(); ++iter) { + for (std::vector::iterator iter = candidates_.begin(); iter != candidates_.end(); ++iter) { // @see: https://tools.ietf.org/html/draft-ietf-ice-rfc5245bis-00#section-4.2 uint32_t priority = (1<<24)*(126) + (1<<8)*(65535) + (1)*(256 - component_id); @@ -424,7 +424,7 @@ srs_error_t SrsMediaDesc::parse_attribute(const std::string& content) sendrecv_ = true; } else if (attribute == "inactive") { inactive_ = true; - } else { + } else { return session_info_.parse_attribute(attribute, value); } @@ -756,7 +756,7 @@ void SrsSdp::add_candidate(const std::string& ip, const int& port, const std::st candidate.type_ = type; for (std::vector::iterator iter = media_descs_.begin(); iter != media_descs_.end(); ++iter) { - iter->candidates_.push_back(candidate); + iter->candidates_.push_back(candidate); } } diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index eb1938a87..fda53ef63 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -63,13 +63,13 @@ SrsRtpHeader::~SrsRtpHeader() srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) { - srs_error_t err = srs_success; + srs_error_t err = srs_success; if (stream->size() < kRtpHeaderFixedSize) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } - /* + /* 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ From eace693ae9f5ca94bf2fdd07b7e56940b0a3e14b Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 26 Apr 2020 13:30:17 +0800 Subject: [PATCH 14/79] Refactor RTC publish, reorder functions. --- trunk/src/app/srs_app_rtc_conn.cpp | 175 ++++++++++++++-------------- trunk/src/app/srs_app_rtp_queue.cpp | 1 + 2 files changed, 90 insertions(+), 86 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 33afa2455..427c44a3d 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1534,27 +1534,6 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui return err; } -void SrsRtcPublisher::update_sendonly_socket(SrsUdpMuxSocket* skt) -{ - srs_trace("session %s address changed, update %s -> %s", - rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), skt->get_peer_id().c_str()); - - srs_freep(sendonly_ukt); - sendonly_ukt = skt->copy_sendonly(); -} - -srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) -{ - if (sendonly_ukt) { - send_rtcp_rr(sendonly_ukt, video_ssrc, rtp_video_queue); - send_rtcp_rr(sendonly_ukt, audio_ssrc, rtp_audio_queue); - send_rtcp_xr_rrtr(sendonly_ukt, video_ssrc); - send_rtcp_xr_rrtr(sendonly_ukt, audio_ssrc); - } - - return srs_success; -} - srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -1576,48 +1555,6 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); } -void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt) -{ - // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { - return; - } - - vector nack_seqs; - rtp_queue->nack_.get_nack_seqs(nack_seqs); - vector::iterator iter = nack_seqs.begin(); - while (iter != nack_seqs.end()) { - char buf[kRtpPacketSize]; - SrsBuffer stream(buf, sizeof(buf)); - // FIXME: Replace magic number. - stream.write_1bytes(0x81); - stream.write_1bytes(kRtpFb); - stream.write_2bytes(3); - stream.write_4bytes(ssrc); - stream.write_4bytes(ssrc); - uint16_t pid = *iter; - uint16_t blp = 0; - while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { - blp |= (1 << (*(iter + 1) - pid - 1)); - ++iter; - } - - stream.write_2bytes(pid); - stream.write_2bytes(blp); - - char protected_buf[kRtpPacketSize]; - int nb_protected_buf = stream.pos(); - - // FIXME: Merge nack rtcp into one packets. - if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { - // TODO: FIXME: Check error. - skt->sendto(protected_buf, nb_protected_buf, 0); - } - - ++iter; - } -} - srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; @@ -1685,6 +1622,7 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ uint32_t sender_packet_count = stream->read_4bytes(); uint32_t sender_octec_count = stream->read_4bytes(); + (void)sender_packet_count; (void)sender_octec_count; (void)rtp_time; srs_verbose("sender report, ssrc_of_sender=%u, rtp_time=%u, sender_packet_count=%u, sender_octec_count=%u", ssrc_of_sender, rtp_time, sender_packet_count, sender_octec_count); @@ -1756,7 +1694,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* int rtt_ntp = compact_ntp - lrr - dlrr; int rtt = ((rtt_ntp * 1000) >> 16) + ((rtt_ntp >> 16) * 1000); - srs_verbose("ssrc=%u, compact_ntp=%u, lrr=%u, dlrr=%u, rtt=%d", + srs_verbose("ssrc=%u, compact_ntp=%u, lrr=%u, dlrr=%u, rtt=%d", ssrc, compact_ntp, lrr, dlrr, rtt); if (ssrc == video_ssrc) { @@ -1771,6 +1709,48 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* return err; } +void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt) +{ + // If DTLS is not OK, drop all messages. + if (!rtc_session->dtls_session) { + return; + } + + vector nack_seqs; + rtp_queue->nack_.get_nack_seqs(nack_seqs); + vector::iterator iter = nack_seqs.begin(); + while (iter != nack_seqs.end()) { + char buf[kRtpPacketSize]; + SrsBuffer stream(buf, sizeof(buf)); + // FIXME: Replace magic number. + stream.write_1bytes(0x81); + stream.write_1bytes(kRtpFb); + stream.write_2bytes(3); + stream.write_4bytes(ssrc); + stream.write_4bytes(ssrc); + uint16_t pid = *iter; + uint16_t blp = 0; + while (iter + 1 != nack_seqs.end() && (*(iter + 1) - pid <= 15)) { + blp |= (1 << (*(iter + 1) - pid - 1)); + ++iter; + } + + stream.write_2bytes(pid); + stream.write_2bytes(blp); + + char protected_buf[kRtpPacketSize]; + int nb_protected_buf = stream.pos(); + + // FIXME: Merge nack rtcp into one packets. + if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + // TODO: FIXME: Check error. + skt->sendto(protected_buf, nb_protected_buf, 0); + } + + ++iter; + } +} + srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue) { srs_error_t err = srs_success; @@ -1938,27 +1918,6 @@ srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* return collect_audio_frame(); } -srs_error_t SrsRtcPublisher::collect_audio_frame() -{ - srs_error_t err = srs_success; - - std::vector > frames; - rtp_audio_queue->get_and_clean_collected_frames(frames); - - for (size_t i = 0; i < frames.size(); ++i) { - if (! frames[i].empty()) { - srs_verbose("collect %d audio frames, seq range %u,%u", - frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); - } - - for (size_t n = 0; n < frames[i].size(); ++n) { - srs_freep(frames[i][n]); - } - } - - return err; -} - srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) { srs_error_t err = srs_success; @@ -1980,6 +1939,27 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* return collect_video_frame(); } +srs_error_t SrsRtcPublisher::collect_audio_frame() +{ + srs_error_t err = srs_success; + + std::vector > frames; + rtp_audio_queue->get_and_clean_collected_frames(frames); + + for (size_t i = 0; i < frames.size(); ++i) { + if (! frames[i].empty()) { + srs_verbose("collect %d audio frames, seq range %u,%u", + frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); + } + + for (size_t n = 0; n < frames[i].size(); ++n) { + srs_freep(frames[i][n]); + } + } + + return err; +} + srs_error_t SrsRtcPublisher::collect_video_frame() { srs_error_t err = srs_success; @@ -2093,6 +2073,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() SrsMessageHeader header; header.message_type = 9; + // TODO: FIXME: Maybe the tbn is not 90k. header.timestamp = timestamp / 90; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); @@ -2106,7 +2087,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() srs_verbose("rtp on video header"); } - if (! sps.empty() && ! pps.empty()) { + if (!sps.empty() && !pps.empty()) { if (source == NULL) { // TODO: FIXME: Should refactor it, directly use http server as handler. ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); @@ -2128,6 +2109,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() SrsMessageHeader header; header.message_type = 9; + // TODO: FIXME: Maybe the tbn is not 90k. header.timestamp = timestamp / 90; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); @@ -2142,6 +2124,27 @@ srs_error_t SrsRtcPublisher::collect_video_frame() return err; } +void SrsRtcPublisher::update_sendonly_socket(SrsUdpMuxSocket* skt) +{ + srs_trace("session %s address changed, update %s -> %s", + rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), skt->get_peer_id().c_str()); + + srs_freep(sendonly_ukt); + sendonly_ukt = skt->copy_sendonly(); +} + +srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) +{ + if (sendonly_ukt) { + // TODO: FIXME: Check error. + send_rtcp_rr(sendonly_ukt, video_ssrc, rtp_video_queue); + send_rtcp_rr(sendonly_ukt, audio_ssrc, rtp_audio_queue); + send_rtcp_xr_rrtr(sendonly_ukt, video_ssrc); + send_rtcp_xr_rrtr(sendonly_ukt, audio_ssrc); + } + + return srs_success; +} SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id) { diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 47f8587a9..942c244aa 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -186,6 +186,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) SrsRtpNackInfo* nack_info = NULL; if ((nack_info = nack_.find(seq)) != NULL) { int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; + (void)nack_rtt; srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); nack_.remove(seq); From db586903ba5a31d27d6b6c32765ad609509ae48b Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 26 Apr 2020 16:12:23 +0800 Subject: [PATCH 15/79] Refactor RTC source create --- trunk/src/app/srs_app_dtls.cpp | 2 +- trunk/src/app/srs_app_dtls.hpp | 2 +- trunk/src/app/srs_app_http_api.cpp | 17 +++- trunk/src/app/srs_app_rtc_conn.cpp | 116 +++++++++++++------------- trunk/src/app/srs_app_rtc_conn.hpp | 18 ++-- trunk/src/kernel/srs_kernel_error.hpp | 1 + 6 files changed, 84 insertions(+), 72 deletions(-) diff --git a/trunk/src/app/srs_app_dtls.cpp b/trunk/src/app/srs_app_dtls.cpp index abc8abf54..5ecac847f 100644 --- a/trunk/src/app/srs_app_dtls.cpp +++ b/trunk/src/app/srs_app_dtls.cpp @@ -69,7 +69,7 @@ static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) return 1; } -srs_error_t SrsDtls::init(const SrsRequest& req) +srs_error_t SrsDtls::init(SrsRequest* r) { srs_error_t err = srs_success; diff --git a/trunk/src/app/srs_app_dtls.hpp b/trunk/src/app/srs_app_dtls.hpp index 65d38c167..560386f77 100644 --- a/trunk/src/app/srs_app_dtls.hpp +++ b/trunk/src/app/srs_app_dtls.hpp @@ -43,7 +43,7 @@ private: SrsDtls(); virtual ~SrsDtls(); public: - srs_error_t init(const SrsRequest& req); + srs_error_t init(SrsRequest* r); public: static SrsDtls* instance(); SSL_CTX* get_dtls_ctx() { return dtls_ctx; } diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 318888c8c..797ba63c7 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -919,7 +919,10 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. - SrsRtcSession* rtc_session = rtc_server->create_rtc_session(request, remote_sdp, local_sdp, eip); + SrsRtcSession* rtc_session = NULL; + if ((err = rtc_server->create_rtc_session(&request, remote_sdp, local_sdp, eip, false, &rtc_session)) != srs_success) { + return srs_error_wrap(err, "create session"); + } if (encrypt.empty()) { rtc_session->set_encrypt(_srs_config->get_rtc_server_encrypt()); } else { @@ -1191,8 +1194,11 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt srs_discovery_tc_url(tcUrl, schema, host, vhost, app, stream_name, port, param); } - srs_trace("RTC publish %s, api=%s, clientip=%s, app=%s, stream=%s, offer=%dB", - streamurl.c_str(), api.c_str(), clientip.c_str(), app.c_str(), stream_name.c_str(), remote_sdp_str.length()); + // For client to specifies the EIP of server. + string eip = r->query_get("eip"); + + srs_trace("RTC publish %s, api=%s, clientip=%s, app=%s, stream=%s, offer=%dB, eip=%s", + streamurl.c_str(), api.c_str(), clientip.c_str(), app.c_str(), stream_name.c_str(), remote_sdp_str.length(), eip.c_str()); // TODO: FIXME: It seems remote_sdp doesn't represents the full SDP information. SrsSdp remote_sdp; @@ -1222,7 +1228,10 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. - SrsRtcSession* rtc_session = rtc_server->create_rtc_session(request, remote_sdp, local_sdp, ""); + SrsRtcSession* rtc_session = NULL; + if ((err = rtc_server->create_rtc_session(&request, remote_sdp, local_sdp, eip, true, &rtc_session)) != srs_success) { + return srs_error_wrap(err, "create session"); + } ostringstream os; if ((err = local_sdp.encode(os)) != srs_success) { diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 427c44a3d..58d6e01c2 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -229,11 +229,11 @@ SrsDtlsSession::~SrsDtlsSession() } } -srs_error_t SrsDtlsSession::initialize(const SrsRequest& req) +srs_error_t SrsDtlsSession::initialize(SrsRequest* r) { srs_error_t err = srs_success; - if ((err = SrsDtls::instance()->init(req)) != srs_success) { + if ((err = SrsDtls::instance()->init(r)) != srs_success) { return srs_error_wrap(err, "DTLS init"); } @@ -682,7 +682,7 @@ srs_error_t SrsRtcSenderThread::on_reload_rtc_server() srs_error_t SrsRtcSenderThread::on_reload_vhost_play(string vhost) { - SrsRequest* req = &rtc_session->request; + SrsRequest* req = rtc_session->req; if (req->vhost != vhost) { return srs_success; @@ -746,7 +746,7 @@ srs_error_t SrsRtcSenderThread::cycle() srs_error_t err = srs_success; SrsSource* source = NULL; - SrsRequest* req = &rtc_session->request; + SrsRequest* req = rtc_session->req; // TODO: FIXME: Should refactor it, directly use http server as handler. ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); @@ -1491,7 +1491,7 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) { sendonly_ukt = NULL; - report_timer = new SrsHourGlass(this, 20 * SRS_UTIME_MILLISECONDS); + report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); rtc_session = session; rtp_h264_demuxer = new SrsRtpH264Demuxer(); @@ -1504,6 +1504,11 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) SrsRtcPublisher::~SrsRtcPublisher() { + // TODO: FIXME: Do unpublish when session timeout. + if (source) { + source->on_unpublish(); + } + srs_freep(report_timer); srs_freep(rtp_h264_demuxer); srs_freep(rtp_opus_demuxer); @@ -1511,7 +1516,7 @@ SrsRtcPublisher::~SrsRtcPublisher() srs_freep(rtp_audio_queue); } -srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest request) +srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest* r) { srs_error_t err = srs_success; @@ -1519,7 +1524,7 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui video_ssrc = vssrc; audio_ssrc = assrc; - this->request = request; + req = r; srs_verbose("video_ssrc=%u, audio_ssrc=%u", video_ssrc, audio_ssrc); @@ -1531,6 +1536,16 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui return srs_error_wrap(err, "start report_timer"); } + // TODO: FIXME: Should refactor it, directly use http server as handler. + ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); + if ((err = _srs_sources->fetch_or_create(req, handler, &source)) != srs_success) { + return srs_error_wrap(err, "create source"); + } + + if ((err = source->on_publish()) != srs_success) { + return srs_error_wrap(err, "on publish"); + } + return err; } @@ -2036,15 +2051,6 @@ srs_error_t SrsRtcPublisher::collect_video_frame() if (video_header_change) { srs_verbose("sps/pps change or init"); - if (source == NULL) { - // TODO: FIXME: Should refactor it, directly use http server as handler. - ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); - if ((err = _srs_sources->fetch_or_create(&request, handler, &source)) != srs_success) { - return srs_error_wrap(err, "create source"); - } - - source->on_publish(); - } uint8_t* video_header = new uint8_t[1500]; SrsBuffer *stream = new SrsBuffer((char*)video_header, 1500); @@ -2088,15 +2094,6 @@ srs_error_t SrsRtcPublisher::collect_video_frame() } if (!sps.empty() && !pps.empty()) { - if (source == NULL) { - // TODO: FIXME: Should refactor it, directly use http server as handler. - ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); - if ((err = _srs_sources->fetch_or_create(&request, handler, &source)) != srs_success) { - return srs_error_wrap(err, "create source"); - } - source->on_publish(); - } - if (idr) { frame_buffer[0] = 0x17; } else { @@ -2146,27 +2143,29 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t return srs_success; } -SrsRtcSession::SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id) +SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id) { - rtc_server = rtc_svr; + rtc_server = s; session_state = INIT; + dtls_session = new SrsDtlsSession(this); // TODO: FIXME: Check error. dtls_session->initialize(req); + sender = NULL; username = un; last_stun_time = srs_get_system_time(); - request = req; + req = r->copy(); source = NULL; cid = context_id; encrypt = true; // TODO: FIXME: Support reload. - sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req.vhost); + sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req->vhost); publisher = NULL; } @@ -2176,6 +2175,7 @@ SrsRtcSession::~SrsRtcSession() srs_freep(sender); srs_freep(publisher); srs_freep(dtls_session); + srs_freep(req); } void SrsRtcSession::set_local_sdp(const SrsSdp& sdp) @@ -2219,21 +2219,6 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req return err; } -srs_error_t SrsRtcSession::check_source() -{ - srs_error_t err = srs_success; - - if (source == NULL) { - // TODO: FIXME: Should refactor it, directly use http server as handler. - ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); - if ((err = _srs_sources->fetch_or_create(&request, handler, &source)) != srs_success) { - return srs_error_wrap(err, "create source"); - } - } - - return err; -} - #ifdef SRS_AUTO_OSX // These functions are similar to the older byteorder(3) family of functions. // For example, be32toh() is identical to ntohl(). @@ -2245,7 +2230,7 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke { srs_error_t err = srs_success; - bool strict_check = _srs_config->get_rtc_stun_strict_check(request.vhost); + bool strict_check = _srs_config->get_rtc_stun_strict_check(req->vhost); if (strict_check && stun_req->get_ice_controlled()) { // @see: https://tools.ietf.org/html/draft-ietf-ice-rfc5245bis-00#section-6.1.3.1 // TODO: Send 487 (Role Conflict) error response. @@ -2334,15 +2319,9 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock srs_verbose("pid=%u, blp=%d", pid, blp); - if ((err = check_source()) != srs_success) { - return srs_error_wrap(err, "check"); - } - if (! source) { - return srs_error_new(ERROR_RTC_SOURCE_CHECK, "can not found source"); - } - vector resend_pkts; - SrsRtpSharedPacket* pkt = source->find_rtp_packet(pid); + // TODO: FIXME: Support ARQ. + SrsRtpSharedPacket* pkt = NULL; // source->find_rtp_packet(pid); if (pkt) { resend_pkts.push_back(pkt); } @@ -2355,7 +2334,9 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock uint32_t loss_seq = pid + i; - SrsRtpSharedPacket* pkt = source->find_rtp_packet(loss_seq); + // TODO: FIXME: Support ARQ. + (void)loss_seq; + SrsRtpSharedPacket* pkt = NULL; // source->find_rtp_packet(loss_seq); if (! pkt) { continue; } @@ -2592,7 +2573,7 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) } // FIXME: err process. - if ((err = publisher->initialize(skt, video_ssrc, audio_ssrc, request)) != srs_success) { + if ((err = publisher->initialize(skt, video_ssrc, audio_ssrc, req)) != srs_success) { return srs_error_wrap(err, "rtc publisher init"); } @@ -3097,8 +3078,25 @@ srs_error_t SrsRtcServer::listen_api() return err; } -SrsRtcSession* SrsRtcServer::create_rtc_session(const SrsRequest& req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const string& mock_eip) -{ +srs_error_t SrsRtcServer::create_rtc_session( + SrsRequest* req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const std::string& mock_eip, bool publish, + SrsRtcSession** psession +) { + srs_error_t err = srs_success; + + SrsSource* source = NULL; + + // TODO: FIXME: Should refactor it, directly use http server as handler. + ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); + if ((err = _srs_sources->fetch_or_create(req, handler, &source)) != srs_success) { + return srs_error_wrap(err, "create source"); + } + + // TODO: FIXME: Refine the API for stream status manage. + if (!source->can_publish(false)) { + return srs_error_new(ERROR_RTC_SOURCE_BUSY, "stream %s busy", req->get_stream_url().c_str()); + } + std::string local_pwd = gen_random_str(32); std::string local_ufrag = ""; std::string username = ""; @@ -3134,7 +3132,9 @@ SrsRtcSession* SrsRtcServer::create_rtc_session(const SrsRequest& req, const Srs session->set_session_state(WAITING_STUN); - return session; + *psession = session; + + return err; } SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 60e63f1ee..838cce636 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -120,7 +120,7 @@ public: SrsDtlsSession(SrsRtcSession* s); virtual ~SrsDtlsSession(); - srs_error_t initialize(const SrsRequest& req); + srs_error_t initialize(SrsRequest* r); srs_error_t on_dtls(SrsUdpMuxSocket* skt); srs_error_t on_dtls_handshake_done(SrsUdpMuxSocket* skt); @@ -190,6 +190,7 @@ public: SrsRtpPacket2* at(int index); }; +// TODO: FIXME: Rename to RTC player or subscriber. class SrsRtcSenderThread : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler { protected: @@ -269,7 +270,7 @@ private: SrsRtpQueue* rtp_video_queue; SrsRtpQueue* rtp_audio_queue; private: - SrsRequest request; + SrsRequest* req; SrsSource* source; std::string sps; std::string pps; @@ -280,7 +281,7 @@ public: SrsRtcPublisher(SrsRtcSession* session); virtual ~SrsRtcPublisher(); public: - srs_error_t initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest request); + srs_error_t initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest* req); srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); @@ -327,12 +328,12 @@ private: // The timeout of session, keep alive by STUN ping pong. srs_utime_t sessionStunTimeout; public: - SrsRequest request; + SrsRequest* req; SrsSource* source; private: SrsRtcPublisher* publisher; public: - SrsRtcSession(SrsRtcServer* rtc_svr, const SrsRequest& req, const std::string& un, int context_id); + SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id); virtual ~SrsRtcSession(); public: SrsSdp* get_local_sdp() { return &local_sdp; } @@ -364,8 +365,6 @@ public: srs_error_t start_publish(SrsUdpMuxSocket* skt); public: bool is_stun_timeout(); -private: - srs_error_t check_source(); private: srs_error_t on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); private: @@ -441,7 +440,10 @@ public: virtual srs_error_t on_udp_packet(SrsUdpMuxSocket* skt); public: virtual srs_error_t listen_api(); - SrsRtcSession* create_rtc_session(const SrsRequest& req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const std::string& mock_eip); + srs_error_t create_rtc_session( + SrsRequest* req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const std::string& mock_eip, bool publish, + SrsRtcSession** psession + ); bool insert_into_id_sessions(const std::string& peer_id, SrsRtcSession* rtc_session); void check_and_clean_timeout_session(); int nn_sessions() { return (int)map_username_session.size(); } diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp index 2e6f57532..9f88c1dda 100644 --- a/trunk/src/kernel/srs_kernel_error.hpp +++ b/trunk/src/kernel/srs_kernel_error.hpp @@ -348,6 +348,7 @@ #define ERROR_RTC_SOURCE_CHECK 5017 #define ERROR_RTC_SDP_EXCHANGE 5018 #define ERROR_RTC_API_BODY 5019 +#define ERROR_RTC_SOURCE_BUSY 5020 /////////////////////////////////////////////////////// // GB28181 API error. From cef1ba938519987dc03e70f74acabad1349127ac Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 26 Apr 2020 16:16:34 +0800 Subject: [PATCH 16/79] Update doc --- trunk/3rdparty/readme.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/3rdparty/readme.txt b/trunk/3rdparty/readme.txt index 1f7d99a9a..331e2928c 100644 --- a/trunk/3rdparty/readme.txt +++ b/trunk/3rdparty/readme.txt @@ -3,9 +3,6 @@ http-parser-2.1.zip nginx-1.5.7.zip for srs to support hls streaming. - -st-1.9.zip - basic framework for srs. openssl-1.1.0e.zip openssl-OpenSSL_1_0_2u.tar.gz @@ -35,8 +32,11 @@ gtest-1.6.0.zip gperftools-2.1.zip gperf tools for performance benchmark. -state-threads-1.9.1.tar.gz: - patched st from https://github.com/ossrs/state-threads/releases/tag/v1.9.1 +st-srs +st-1.9.zip +state-threads +state-threads-1.9.1.tar.gz + Patched ST from https://github.com/ossrs/state-threads links: nginx: @@ -44,7 +44,7 @@ links: http-parser: https://github.com/joyent/http-parser state-threads: - http://sourceforge.net/projects/state-threads + https://github.com/ossrs/state-threads ffmpeg: http://ffmpeg.org/ http://ffmpeg.org/releases/ffmpeg-3.2.4.tar.gz From e4329fd1a0ee9787e60a863815c03e6fabe23625 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 26 Apr 2020 19:00:36 +0800 Subject: [PATCH 17/79] Refactor RTC, create source once --- trunk/research/players/rtc_publisher.html | 2 +- trunk/src/app/srs_app_rtc_conn.cpp | 48 ++++++++++++++--------- trunk/src/app/srs_app_rtc_conn.hpp | 1 + 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index c8206ed79..ce183782d 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -46,7 +46,7 @@
- +

diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 58d6e01c2..256ef3cf5 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -2145,29 +2145,20 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id) { - rtc_server = s; - session_state = INIT; - - dtls_session = new SrsDtlsSession(this); - // TODO: FIXME: Check error. - dtls_session->initialize(req); - - sender = NULL; - username = un; - - last_stun_time = srs_get_system_time(); - req = r->copy(); - source = NULL; - cid = context_id; encrypt = true; - // TODO: FIXME: Support reload. - sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req->vhost); - + source = NULL; publisher = NULL; + sender = NULL; + rtc_server = s; + dtls_session = new SrsDtlsSession(this); + + session_state = INIT; + last_stun_time = 0; + sessionStunTimeout = 0; } SrsRtcSession::~SrsRtcSession() @@ -2188,6 +2179,21 @@ void SrsRtcSession::switch_to_context() _srs_context->set_id(cid); } +srs_error_t SrsRtcSession::initialize() +{ + srs_error_t err = srs_success; + + if ((err = dtls_session->initialize(req)) != srs_success) { + return srs_error_wrap(err, "init"); + } + + // TODO: FIXME: Support reload. + sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req->vhost); + last_stun_time = srs_get_system_time(); + + return err; +} + srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req) { srs_error_t err = srs_success; @@ -3110,7 +3116,13 @@ srs_error_t SrsRtcServer::create_rtc_session( int cid = _srs_context->get_id(); SrsRtcSession* session = new SrsRtcSession(this, req, username, cid); + if ((err = session->initialize()) != srs_success) { + srs_freep(session); + return srs_error_wrap(err, "init"); + } + map_username_session.insert(make_pair(username, session)); + *psession = session; local_sdp.set_ice_ufrag(local_ufrag); local_sdp.set_ice_pwd(local_pwd); @@ -3132,8 +3144,6 @@ srs_error_t SrsRtcServer::create_rtc_session( session->set_session_state(WAITING_STUN); - *psession = session; - return err; } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 838cce636..0797a0274 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -354,6 +354,7 @@ public: void switch_to_context(); public: + srs_error_t initialize(); srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); srs_error_t on_dtls(SrsUdpMuxSocket* skt); srs_error_t on_rtcp(SrsUdpMuxSocket* skt); From 028ef56772220c34f83f27784d7a80408bb9ab3e Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 26 Apr 2020 22:41:03 +0800 Subject: [PATCH 18/79] Fix sendmmsg build failed bug --- trunk/3rdparty/st-srs/Makefile | 4 - trunk/3rdparty/st-srs/io.c | 2 +- trunk/3rdparty/st-srs/public.h | 2 + trunk/auto/depends.sh | 7 +- trunk/auto/options.sh | 391 +++++++++++++++++++-------------- 5 files changed, 231 insertions(+), 175 deletions(-) diff --git a/trunk/3rdparty/st-srs/Makefile b/trunk/3rdparty/st-srs/Makefile index 7e641d195..7102eedb4 100644 --- a/trunk/3rdparty/st-srs/Makefile +++ b/trunk/3rdparty/st-srs/Makefile @@ -189,10 +189,6 @@ OTHER_FLAGS = -Wall ifeq ($(shell test -f /usr/include/sys/epoll.h && echo yes), yes) DEFINES += -DMD_HAVE_EPOLL endif -# For SRS, sendmmsg -ifeq ($(shell grep -qs sendmmsg /usr/include/sys/socket.h && echo yes), yes) -DEFINES += -DMD_HAVE_SENDMMSG -D_GNU_SOURCE -endif endif ifeq ($(OS), NETBSD) diff --git a/trunk/3rdparty/st-srs/io.c b/trunk/3rdparty/st-srs/io.c index 750099450..f4345aa89 100644 --- a/trunk/3rdparty/st-srs/io.c +++ b/trunk/3rdparty/st-srs/io.c @@ -743,7 +743,7 @@ int st_sendmsg(_st_netfd_t *fd, const struct msghdr *msg, int flags, st_utime_t } -#if defined(MD_HAVE_SENDMMSG) && defined(_GNU_SOURCE) +#if defined(MD_HAVE_SENDMMSG) && defined(__linux__) && defined(_GNU_SOURCE) int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout) { int n; diff --git a/trunk/3rdparty/st-srs/public.h b/trunk/3rdparty/st-srs/public.h index c54bd790a..332f3291c 100644 --- a/trunk/3rdparty/st-srs/public.h +++ b/trunk/3rdparty/st-srs/public.h @@ -151,7 +151,9 @@ extern int st_recvfrom(st_netfd_t fd, void *buf, int len, struct sockaddr *from, extern int st_sendto(st_netfd_t fd, const void *msg, int len, const struct sockaddr *to, int tolen, st_utime_t timeout); extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, st_utime_t timeout); extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, st_utime_t timeout); +#if defined(__linux__) && defined(_GNU_SOURCE) extern int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout); +#endif extern st_netfd_t st_open(const char *path, int oflags, mode_t mode); #ifdef DEBUG diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index b6d6a644a..97dae61ec 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -338,7 +338,7 @@ fi ##################################################################################### if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then # check the cross build flag file, if flag changed, need to rebuild the st. - _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_EPOLL" && _ST_LD=${SRS_TOOL_LD} && _ST_OBJ="LINUX_*" + _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-O0" && _ST_LD=${SRS_TOOL_LD} && _ST_OBJ="LINUX_*" if [[ $SRS_VALGRIND == YES ]]; then _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_VALGRIND" fi @@ -347,9 +347,12 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_LD=${SRS_TOOL_CC} && _ST_OBJ="DARWIN_*" fi # For UDP sendmmsg, disable it if not suppported. - if [[ $SRS_SENDMMSG == YES ]]; then + if [[ $SRS_HAS_SENDMMSG == YES ]]; then echo "Build ST with UDP sendmmsg support." _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_HAVE_SENDMMSG -D_GNU_SOURCE" + else + echo "Build ST without UDP sendmmsg support." + _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -UMD_HAVE_SENDMMSG -U_GNU_SOURCE" fi # Pass the global extra flags. if [[ $SRS_EXTRA_FLAGS != '' ]]; then diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 745b45e29..cd7cfe8e4 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -122,6 +122,7 @@ SRS_NASM=YES SRS_SRTP_ASM=YES SRS_SENDMMSG=YES SRS_HAS_SENDMMSG=YES +SRS_DETECT_SENDMMSG=YES SRS_DEBUG=NO ##################################################################################### @@ -138,32 +139,20 @@ Presets: Features: -h, --help Print this message and exit 0. - --with-ssl Enable rtmp complex handshake, requires openssl-devel installed. - --with-hds Enable hds streaming, mux RTMP to F4M/F4V files. - --with-stream-caster Enable stream caster to serve other stream over other protocol. - --with-stat Enable the data statistic, for http api. - --with-librtmp Enable srs-librtmp, library for client. - --with-research Build the research tools. - --with-utest Build the utest for SRS. - --with-srt Build the SRT support for SRS. - --with-rtc Build the WebRTC support for SRS. - --with-gb28181 Build the GB28181 support for SRS. - - --without-ssl Disable rtmp complex handshake. - --without-hds Disable hds, the adobe http dynamic streaming. - --without-stream-caster Disable stream caster, only listen and serve RTMP/HTTP. - --without-stat Disable the data statistic feature. - --without-librtmp Disable srs-librtmp, library for client. - --without-research Disable the research tools. - --without-utest Disable the utest for SRS. - --without-srt Disable the SRT support for SRS. - --without-rtc Disable the WebRTC support for SRS. - --without-gb28181 Disable the GB28181 support for SRS. + --ssl=on|off Whether build the rtmp complex handshake, requires openssl-devel installed. + --hds=on|off Whether build the hds streaming, mux RTMP to F4M/F4V files. + --stream-caster=on|off Whether build the stream caster to serve other stream over other protocol. + --stat=on|off Whether build the the data statistic, for http api. + --librtmp=on|off Whether build the srs-librtmp, library for client. + --research=on|off Whether build the research tools. + --utest=on|off Whether build the utest for SRS. + --srt=on|off Whether build the SRT support for SRS. + --rtc=on|off Whether build the WebRTC support for SRS. + --gb28181=on|off Whether build the GB28181 support for SRS. --prefix= The absolute installation path for srs. Default: $SRS_PREFIX - --static Whether add '-static' to link options. - --gcov Whether enable the GCOV compiler options. - --debug Whether enable the debug code, may hurt performance. + --gcov=on|off Whether enable the GCOV compiler options. + --debug=on|off Whether enable the debug code, may hurt performance. --jobs[=N] Allow N jobs at once; infinite jobs with no arg. Used for make in the configure, for example, to make ffmpeg. --log-verbose Whether enable the log verbose level. default: no. @@ -171,30 +160,20 @@ Features: --log-trace Whether enable the log trace level. default: yes. Performance: @see https://blog.csdn.net/win_lin/article/details/53503869 - --with-valgrind Support valgrind for memory check. - --with-gperf Build SRS with gperf tools(no gmd/gmc/gmp/gcp, with tcmalloc only). - --with-gmc Build memory check for SRS with gperf tools. - --with-gmd Build memory defense(corrupt memory) for SRS with gperf tools. - --with-gmp Build memory profile for SRS with gperf tools. - --with-gcp Build cpu profile for SRS with gperf tools. - --with-gprof Build SRS with gprof(GNU profile tool). + --valgrind=on|off Whether build valgrind for memory check. + --gperf=on|off Whether build SRS with gperf tools(no gmd/gmc/gmp/gcp, with tcmalloc only). + --gmc=on|off Whether build memory check for SRS with gperf tools. + --gmd=on|off Whether build memory defense(corrupt memory) for SRS with gperf tools. + --gmp=on|off Whether build memory profile for SRS with gperf tools. + --gcp=on|off Whether build cpu profile for SRS with gperf tools. + --gprof=on|off Whether build SRS with gprof(GNU profile tool). - --without-valgrind Do not support valgrind for memory check. - --without-gperf Do not build SRS with gperf tools(without tcmalloc and gmd/gmc/gmp/gcp). - --without-gmc Do not build memory check for SRS with gperf tools. - --without-gmd Do not build memory defense for SRS with gperf tools. - --without-gmp Do not build memory profile for SRS with gperf tools. - --without-gcp Do not build cpu profile for SRS with gperf tools. - --without-gprof Do not build srs with gprof(GNU profile tool). - - --with-nasm Build FFMPEG for RTC with nasm support. - --without-nasm Build FFMPEG for RTC without nasm support, for CentOS6 nasm is too old. - --with-srtp-nasm Build SRTP with ASM(openssl-asm) support, requires RTC and openssl-1.0.*. - --without-srtp-nasm Disable SRTP ASM support. - --with-sendmmsg Enable UDP sendmmsg support. @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html - --without-sendmmsg Disable UDP sendmmsg support. + --nasm=on|off Whether build FFMPEG for RTC with nasm support. + --srtp-nasm=on|off Whether build SRTP with ASM(openssl-asm) support, requires RTC and openssl-1.0.*. + --sendmmsg=on|off Whether enable UDP sendmmsg support. @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html Toolchain options: @see https://github.com/ossrs/srs/issues/1547#issuecomment-576078411 + --static Whether add '-static' to link options. --arm Enable crossbuild for ARM. --mips Enable crossbuild for MIPS. --cc= Use c compiler CC, default is gcc. @@ -213,14 +192,16 @@ Conflicts: The complex tools not available for arm. Experts: - --use-sys-ssl Do not compile ssl, use system ssl(-lssl) if required. + --sys-ssl=on|off Do not compile ssl, use system ssl(-lssl) if required. --use-shared-st Use link shared libraries for ST which uses MPL license. --use-shared-srt Use link shared libraries for SRT which uses MPL license. --export-librtmp-project= Export srs-librtmp to specified project in path. --export-librtmp-single= Export srs-librtmp to a single file(.h+.cpp) in path. - --build-tag= Set the build object directory suffix. - --with-clean Configure SRS and do make clean if possible. - --without-clean Configure SRS and never make clean even possible.. + --build-tag= Set the build object directory suffix. + --with-clean Configure SRS and do make clean if possible. + --without-clean Configure SRS and never make clean even possible. + --detect-sendmmsg=on|off Whether detect the sendmmsg API. + --has-sendmmsg=on|off Whether OS supports sendmmsg API. Workflow: 1. Apply "Presets". if not specified, use default preset. @@ -239,55 +220,6 @@ function parse_user_option() { -h) help=yes ;; --help) help=yes ;; - --with-ssl) SRS_SSL=YES ;; - --with-hds) SRS_HDS=YES ;; - --with-nginx) SRS_NGINX=YES ;; - --with-ffmpeg) SRS_FFMPEG_TOOL=YES ;; - --with-transcode) SRS_TRANSCODE=YES ;; - --with-ingest) SRS_INGEST=YES ;; - --with-stat) SRS_STAT=YES ;; - --with-stream-caster) SRS_STREAM_CASTER=YES ;; - --with-librtmp) SRS_LIBRTMP=YES ;; - --with-research) SRS_RESEARCH=YES ;; - --with-utest) SRS_UTEST=YES ;; - --with-srt) SRS_SRT=YES ;; - --with-rtc) SRS_RTC=YES ;; - --with-gb28181) SRS_GB28181=YES ;; - --with-nasm) SRS_NASM=YES ;; - --with-srtp-nasm) SRS_SRTP_ASM=YES ;; - --with-sendmmsg) SRS_SENDMMSG=YES ;; - --with-clean) SRS_CLEAN=YES ;; - --with-gperf) SRS_GPERF=YES ;; - --with-gmc) SRS_GPERF_MC=YES ;; - --with-gmd) SRS_GPERF_MD=YES ;; - --with-gmp) SRS_GPERF_MP=YES ;; - --with-gcp) SRS_GPERF_CP=YES ;; - --with-gprof) SRS_GPROF=YES ;; - --with-arm-ubuntu12) SRS_CROSS_BUILD=YES ;; - --with-mips-ubuntu12) SRS_CROSS_BUILD=YES ;; - - --without-hds) SRS_HDS=NO ;; - --without-nginx) SRS_NGINX=NO ;; - --without-ffmpeg) SRS_FFMPEG_TOOL=NO ;; - --without-librtmp) SRS_LIBRTMP=NO ;; - --without-research) SRS_RESEARCH=NO ;; - --without-utest) SRS_UTEST=NO ;; - --without-srt) SRS_SRT=NO ;; - --without-rtc) SRS_RTC=NO ;; - --without-gb28181) SRS_GB28181=NO ;; - --without-nasm) SRS_NASM=NO ;; - --without-srtp-nasm) SRS_SRTP_ASM=NO ;; - --without-sendmmsg) SRS_SENDMMSG=NO ;; - --without-clean) SRS_CLEAN=NO ;; - --without-gperf) SRS_GPERF=NO ;; - --without-gmc) SRS_GPERF_MC=NO ;; - --without-gmd) SRS_GPERF_MD=NO ;; - --without-gmp) SRS_GPERF_MP=NO ;; - --without-gcp) SRS_GPERF_CP=NO ;; - --without-gprof) SRS_GPROF=NO ;; - --without-arm-ubuntu12) SRS_CROSS_BUILD=NO ;; - --without-mips-ubuntu12) SRS_CROSS_BUILD=NO ;; - --jobs) SRS_JOBS=${value} ;; --prefix) SRS_PREFIX=${value} ;; --static) SRS_STATIC=YES ;; @@ -320,33 +252,147 @@ function parse_user_option() { --disable-all) SRS_DISABLE_ALL=YES ;; --pure-rtmp) SRS_PURE_RTMP=YES ;; --full) SRS_ENABLE_ALL=YES ;; - - --use-sys-ssl) SRS_USE_SYS_SSL=YES ;; - --use-shared-st) SRS_SHARED_ST=YES ;; - --use-shared-srt) SRS_SHARED_SRT=YES ;; --memory-watch) SRS_MEM_WATCH=YES ;; --export-librtmp-project) SRS_EXPORT_LIBRTMP_PROJECT=${value} ;; --export-librtmp-single) SRS_EXPORT_LIBRTMP_SINGLE=${value} ;; + + --detect-sendmmsg) if [[ $value == off ]]; then SRS_DETECT_SENDMMSG=NO; else SRS_DETECT_SENDMMSG=YES; fi ;; + --has-sendmmsg) if [[ $value == off ]]; then SRS_HAS_SENDMMSG=NO; else SRS_HAS_SENDMMSG=YES; fi ;; + --sendmmsg) if [[ $value == off ]]; then SRS_SENDMMSG=NO; else SRS_SENDMMSG=YES; fi ;; + + --without-srtp-nasm) SRS_SRTP_ASM=NO ;; + --with-srtp-nasm) SRS_SRTP_ASM=YES ;; + --srtp-nasm) if [[ $value == off ]]; then SRS_SRTP_ASM=NO; else SRS_SRTP_ASM=YES; fi ;; + + --without-nasm) SRS_NASM=NO ;; + --with-nasm) SRS_NASM=YES ;; + --nasm) if [[ $value == off ]]; then SRS_NASM=NO; else SRS_NASM=YES; fi ;; + + --with-ssl) SRS_SSL=YES ;; + --ssl) if [[ $value == off ]]; then SRS_SSL=NO; else SRS_SSL=YES; fi ;; + + --with-hds) SRS_HDS=YES ;; + --without-hds) SRS_HDS=NO ;; + --hds) if [[ $value == off ]]; then SRS_HDS=NO; else SRS_HDS=YES; fi ;; + + --with-nginx) SRS_NGINX=YES ;; + --without-nginx) SRS_NGINX=NO ;; + --nginx) if [[ $value == off ]]; then SRS_NGINX=NO; else SRS_NGINX=YES; fi ;; + + --with-ffmpeg) SRS_FFMPEG_TOOL=YES ;; + --without-ffmpeg) SRS_FFMPEG_TOOL=NO ;; + --ffmpeg) if [[ $value == off ]]; then SRS_FFMPEG_TOOL=NO; else SRS_FFMPEG_TOOL=YES; fi ;; + + --with-transcode) SRS_TRANSCODE=YES ;; + --without-transcode) echo "ignore option \"$option\"" ;; + --transcode) if [[ $value == off ]]; then SRS_TRANSCODE=NO; else SRS_TRANSCODE=YES; fi ;; + + --with-ingest) SRS_INGEST=YES ;; + --without-ingest) echo "ignore option \"$option\"" ;; + --ingest) if [[ $value == off ]]; then SRS_INGEST=NO; else SRS_INGEST=YES; fi ;; + + --with-stat) SRS_STAT=YES ;; + --without-stat) echo "ignore option \"$option\"" ;; + --stat) if [[ $value == off ]]; then SRS_STAT=NO; else SRS_STAT=YES; fi ;; + + --with-stream-caster) SRS_STREAM_CASTER=YES ;; + --without-stream-caster) echo "ignore option \"$option\"" ;; + --stream-caster) if [[ $value == off ]]; then SRS_STREAM_CASTER=NO; else SRS_STREAM_CASTER=YES; fi ;; + + --with-librtmp) SRS_LIBRTMP=YES ;; + --without-librtmp) SRS_LIBRTMP=NO ;; + --librtmp) if [[ $value == off ]]; then SRS_LIBRTMP=NO; else SRS_LIBRTMP=YES; fi ;; + + --with-research) SRS_RESEARCH=YES ;; + --without-research) SRS_RESEARCH=NO ;; + --research) if [[ $value == off ]]; then SRS_RESEARCH=NO; else SRS_RESEARCH=YES; fi ;; + + --with-utest) SRS_UTEST=YES ;; + --without-utest) SRS_UTEST=NO ;; + --utest) if [[ $value == off ]]; then SRS_UTEST=NO; else SRS_UTEST=YES; fi ;; + + --with-srt) SRS_SRT=YES ;; + --without-srt) SRS_SRT=NO ;; + --srt) if [[ $value == off ]]; then SRS_SRT=NO; else SRS_SRT=YES; fi ;; + + --with-rtc) SRS_RTC=YES ;; + --without-rtc) SRS_RTC=NO ;; + --rtc) if [[ $value == off ]]; then SRS_RTC=NO; else SRS_RTC=YES; fi ;; + + --with-gb28181) SRS_GB28181=YES ;; + --without-gb28181) SRS_GB28181=NO ;; + --gb28181) if [[ $value == off ]]; then SRS_GB28181=NO; else SRS_GB28181=YES; fi ;; + + --with-clean) SRS_CLEAN=YES ;; + --without-clean) SRS_CLEAN=NO ;; + --clean) if [[ $value == off ]]; then SRS_CLEAN=NO; else SRS_CLEAN=YES; fi ;; + + --with-gperf) SRS_GPERF=YES ;; + --without-gperf) SRS_GPERF=NO ;; + --gperf) if [[ $value == off ]]; then SRS_GPERF=NO; else SRS_GPERF=YES; fi ;; + + --with-gmc) SRS_GPERF_MC=YES ;; + --without-gmc) SRS_GPERF_MC=NO ;; + --gmc) if [[ $value == off ]]; then SRS_GPERF_MC=NO; else SRS_GPERF_MC=YES; fi ;; + + --with-gmd) SRS_GPERF_MD=YES ;; + --without-gmd) SRS_GPERF_MD=NO ;; + --gmd) if [[ $value == off ]]; then SRS_GPERF_MD=NO; else SRS_GPERF_MD=YES; fi ;; + + --with-gmp) SRS_GPERF_MP=YES ;; + --without-gmp) SRS_GPERF_MP=NO ;; + --gmp) if [[ $value == off ]]; then SRS_GPERF_MP=NO; else SRS_GPERF_MP=YES; fi ;; + + --with-gcp) SRS_GPERF_CP=YES ;; + --without-gcp) SRS_GPERF_CP=NO ;; + --gcp) if [[ $value == off ]]; then SRS_GPERF_CP=NO; else SRS_GPERF_CP=YES; fi ;; + + --with-gprof) SRS_GPROF=YES ;; + --without-gprof) SRS_GPROF=NO ;; + --gprof) if [[ $value == off ]]; then SRS_GPROF=NO; else SRS_GPROF=YES; fi ;; + + --with-arm-ubuntu12) SRS_CROSS_BUILD=YES ;; + --without-arm-ubuntu12) SRS_CROSS_BUILD=NO ;; + --arm-ubuntu12) if [[ $value == off ]]; then SRS_CROSS_BUILD=NO; else SRS_CROSS_BUILD=YES; fi ;; + + --with-mips-ubuntu12) SRS_CROSS_BUILD=YES ;; + --without-mips-ubuntu12) SRS_CROSS_BUILD=NO ;; + --mips-ubuntu12) if [[ $value == off ]]; then SRS_CROSS_BUILD=NO; else SRS_CROSS_BUILD=YES; fi ;; + + --use-sys-ssl) SRS_USE_SYS_SSL=YES ;; + --without-ssl) echo "ignore option \"$option\"" ;; + --sys-ssl) if [[ $value == off ]]; then SRS_USE_SYS_SSL=NO; else SRS_USE_SYS_SSL=YES; fi ;; + + --use-shared-st) SRS_SHARED_ST=YES ;; + --shared-st) if [[ $value == off ]]; then SRS_SHARED_ST=NO; else SRS_SHARED_ST=YES; fi ;; + + --use-shared-srt) SRS_SHARED_SRT=YES ;; + --shared-srt) if [[ $value == off ]]; then SRS_SHARED_SRT=NO; else SRS_SHARED_SRT=YES; fi ;; + --with-valgrind) SRS_VALGRIND=YES ;; --without-valgrind) SRS_VALGRIND=NO ;; + --valgrind) if [[ $value == off ]]; then SRS_VALGRIND=NO; else SRS_VALGRIND=YES; fi ;; --with-http-callback) SRS_HTTP_CALLBACK=YES ;; - --with-http-api) SRS_HTTP_API=YES ;; - --with-http-server) SRS_HTTP_SERVER=YES ;; - --with-hls) SRS_HLS=YES ;; - --with-dvr) SRS_DVR=YES ;; - - --without-stream-caster) echo "ignore option \"$option\"" ;; - --without-ingest) echo "ignore option \"$option\"" ;; - --without-ssl) echo "ignore option \"$option\"" ;; - --without-stat) echo "ignore option \"$option\"" ;; - --without-transcode) echo "ignore option \"$option\"" ;; --without-http-callback) echo "ignore option \"$option\"" ;; - --without-http-server) echo "ignore option \"$option\"" ;; + --http-callback) if [[ $value == off ]]; then SRS_HTTP_CALLBACK=NO; else SRS_HTTP_CALLBACK=YES; fi ;; + + --with-http-api) SRS_HTTP_API=YES ;; --without-http-api) echo "ignore option \"$option\"" ;; + --http-api) if [[ $value == off ]]; then SRS_HTTP_API=NO; else SRS_HTTP_API=YES; fi ;; + + --with-http-server) SRS_HTTP_SERVER=YES ;; + --without-http-server) echo "ignore option \"$option\"" ;; + --http-server) if [[ $value == off ]]; then SRS_HTTP_SERVER=NO; else SRS_HTTP_SERVER=YES; fi ;; + + --with-hls) SRS_HLS=YES ;; --without-hls) echo "ignore option \"$option\"" ;; + --hls) if [[ $value == off ]]; then SRS_HLS=NO; else SRS_HLS=YES; fi ;; + + --with-dvr) SRS_DVR=YES ;; --without-dvr) echo "ignore option \"$option\"" ;; + --dvr) if [[ $value == off ]]; then SRS_DVR=NO; else SRS_DVR=YES; fi ;; *) echo "$0: error: invalid option \"$option\"" @@ -569,20 +615,26 @@ function apply_user_detail_options() { # Detect whether has sendmmsg. # @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html - mkdir -p ${SRS_OBJS} && - echo " #include " > ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " int main(int argc, char** argv) { " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " struct mmsghdr hdr; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " hdr.msg_len = 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " return 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " } " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - ${SRS_TOOL_CC} -c ${SRS_OBJS}/_tmp_sendmmsg_detect.c -D_GNU_SOURCE -o /dev/null >/dev/null 2>&1 - ret=$?; rm -f ${SRS_OBJS}/_tmp_sendmmsg_detect.c; - if [[ $ret -ne 0 ]]; then - SRS_HAS_SENDMMSG=NO + if [[ $SRS_DETECT_SENDMMSG == YES ]]; then + mkdir -p ${SRS_OBJS} && + echo " #include " > ${SRS_OBJS}/_tmp_sendmmsg_detect.c + echo " int main(int argc, char** argv) { " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c + echo " struct mmsghdr hdr; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c + echo " hdr.msg_len = 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c + echo " return 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c + echo " } " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c + ${SRS_TOOL_CC} -c ${SRS_OBJS}/_tmp_sendmmsg_detect.c -D_GNU_SOURCE -o /dev/null >/dev/null 2>&1 + ret=$?; rm -f ${SRS_OBJS}/_tmp_sendmmsg_detect.c; + if [[ $ret -ne 0 ]]; then + SRS_HAS_SENDMMSG=NO + fi + fi + + # If system has no sendmmsg, disable sendmmsg. + if [[ $SRS_HAS_SENDMMSG == NO ]]; then if [[ $SRS_SENDMMSG == YES ]]; then - echo "Disable UDP sendmmsg automatically" - SRS_SENDMMSG=NO + echo "Disable UDP sendmmsg automatically" + SRS_SENDMMSG=NO fi fi } @@ -593,48 +645,51 @@ function regenerate_options() { SRS_AUTO_USER_CONFIGURE=`echo $opt` # regenerate the options for default values. SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" - if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hls"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hls"; fi - if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-hds"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-hds"; fi - if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-dvr"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-dvr"; fi - if [ $SRS_SSL = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-ssl"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-ssl"; fi - if [ $SRS_TRANSCODE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-transcode"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-transcode"; fi - if [ $SRS_INGEST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-ingest"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-ingest"; fi - if [ $SRS_STAT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-stat"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-stat"; fi - if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-http-callback"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-http-callback"; fi - if [ $SRS_HTTP_SERVER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-http-server"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-http-server"; fi - if [ $SRS_STREAM_CASTER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-stream-caster"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-stream-caster"; fi - if [ $SRS_HTTP_API = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-http-api"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-http-api"; fi - if [ $SRS_LIBRTMP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-librtmp"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-librtmp"; fi - if [ $SRS_RESEARCH = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-research"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-research"; fi - if [ $SRS_UTEST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-utest"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-utest"; fi - if [ $SRS_SRT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-srt"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-srt"; fi - if [ $SRS_RTC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-rtc"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-rtc"; fi - if [ $SRS_GB28181 = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gb28181"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gb28181"; fi - if [ $SRS_NASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-nasm"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-nasm"; fi - if [ $SRS_SRTP_ASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-srtp-nasm"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-srtp-nasm"; fi - if [ $SRS_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-sendmmsg"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-sendmmsg"; fi - if [ $SRS_CLEAN = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-clean"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-clean"; fi - if [ $SRS_GPERF = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gperf"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gperf"; fi - if [ $SRS_GPERF_MC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gmc"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gmc"; fi - if [ $SRS_GPERF_MD = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gmd"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gmd"; fi - if [ $SRS_GPERF_MP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gmp"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gmp"; fi - if [ $SRS_GPERF_CP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gcp"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gcp"; fi - if [ $SRS_GPROF = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --with-gprof"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --without-gprof"; fi - if [ $SRS_STATIC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --static"; fi - if [ $SRS_SHARED_ST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --use-shared-st"; fi - if [ $SRS_SHARED_SRT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --use-shared-srt"; fi - if [ $SRS_LOG_VERBOSE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-verbose"; fi - if [ $SRS_LOG_INFO = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-info"; fi - if [ $SRS_LOG_TRACE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-trace"; fi - if [ $SRS_GCOV = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gcov"; fi - if [ $SRS_DEBUG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --debug"; fi - if [[ $SRS_EXTRA_FLAGS != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --extra-flags=\\\"$SRS_EXTRA_FLAGS\\\""; fi - if [[ $SRS_BUILD_TAG != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --build-tag=\\\"$SRS_BUILD_TAG\\\""; fi - if [[ $SRS_TOOL_CC != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cc=$SRS_TOOL_CC"; fi - if [[ $SRS_TOOL_CXX != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cxx=$SRS_TOOL_CXX"; fi - if [[ $SRS_TOOL_AR != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ar=$SRS_TOOL_AR"; fi - if [[ $SRS_TOOL_LD != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ld=$SRS_TOOL_LD"; fi - if [[ $SRS_TOOL_RANDLIB != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --randlib=$SRS_TOOL_RANDLIB"; fi + if [ $SRS_HLS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hls=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hls=off"; fi + if [ $SRS_HDS = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hds=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hds=off"; fi + if [ $SRS_DVR = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --dvr=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --dvr=off"; fi + if [ $SRS_SSL = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ssl=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ssl=off"; fi + if [ $SRS_USE_SYS_SSL = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sys-ssl=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sys-ssl=off"; fi + if [ $SRS_TRANSCODE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --transcode=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --transcode=off"; fi + if [ $SRS_INGEST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ingest=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ingest=off"; fi + if [ $SRS_STAT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stat=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stat=off"; fi + if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-callback=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-callback=off"; fi + if [ $SRS_HTTP_SERVER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-server=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-server=off"; fi + if [ $SRS_STREAM_CASTER = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stream-caster=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --stream-caster=off"; fi + if [ $SRS_HTTP_API = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-api=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --http-api=off"; fi + if [ $SRS_LIBRTMP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --librtmp=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --librtmp=off"; fi + if [ $SRS_RESEARCH = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --research=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --research=off"; fi + if [ $SRS_UTEST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --utest=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --utest=off"; fi + if [ $SRS_SRT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srt=off"; fi + if [ $SRS_RTC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --rtc=off"; fi + if [ $SRS_GB28181 = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gb28181=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gb28181=off"; fi + if [ $SRS_NASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --nasm=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --nasm=off"; fi + if [ $SRS_SRTP_ASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srtp-nasm=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srtp-nasm=off"; fi + if [ $SRS_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sendmmsg=off"; fi + if [ $SRS_DETECT_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --detect-sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --detect-sendmmsg=off"; fi + if [ $SRS_HAS_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --has-sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --has-sendmmsg=off"; fi + if [ $SRS_CLEAN = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --clean=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --clean=off"; fi + if [ $SRS_GPERF = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gperf=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gperf=off"; fi + if [ $SRS_GPERF_MC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmc=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmc=off"; fi + if [ $SRS_GPERF_MD = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmd=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmd=off"; fi + if [ $SRS_GPERF_MP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmp=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmp=off"; fi + if [ $SRS_GPERF_CP = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gcp=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gcp=off"; fi + if [ $SRS_GPROF = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gprof=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gprof=off"; fi + if [ $SRS_STATIC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --static"; fi + if [ $SRS_SHARED_ST = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --use-shared-st"; fi + if [ $SRS_SHARED_SRT = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --use-shared-srt"; fi + if [ $SRS_LOG_VERBOSE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-verbose"; fi + if [ $SRS_LOG_INFO = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-info"; fi + if [ $SRS_LOG_TRACE = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --log-trace"; fi + if [ $SRS_GCOV = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gcov"; fi + if [ $SRS_DEBUG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --debug"; fi + if [[ $SRS_EXTRA_FLAGS != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --extra-flags=\\\"$SRS_EXTRA_FLAGS\\\""; fi + if [[ $SRS_BUILD_TAG != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --build-tag=\\\"$SRS_BUILD_TAG\\\""; fi + if [[ $SRS_TOOL_CC != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cc=$SRS_TOOL_CC"; fi + if [[ $SRS_TOOL_CXX != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cxx=$SRS_TOOL_CXX"; fi + if [[ $SRS_TOOL_AR != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ar=$SRS_TOOL_AR"; fi + if [[ $SRS_TOOL_LD != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --ld=$SRS_TOOL_LD"; fi + if [[ $SRS_TOOL_RANDLIB != '' ]]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --randlib=$SRS_TOOL_RANDLIB"; fi echo "User config: $SRS_AUTO_USER_CONFIGURE" echo "Detail config: ${SRS_AUTO_CONFIGURE}" } From 7692e589ed6f8a2c3d9722ea2d4aa248c993e753 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 27 Apr 2020 09:35:50 +0800 Subject: [PATCH 19/79] For RTC publisher, support black-hole --- trunk/conf/full.conf | 10 +++ trunk/src/app/srs_app_config.cpp | 48 ++++++++++++++- trunk/src/app/srs_app_config.hpp | 2 + trunk/src/app/srs_app_rtc_conn.cpp | 98 +++++++++++++++++++++++++----- trunk/src/app/srs_app_rtc_conn.hpp | 5 ++ 5 files changed, 146 insertions(+), 17 deletions(-) diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index bb852f43e..4a8ea1aa1 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -461,6 +461,16 @@ rtc_server { # then system queue is 2000*4 = 8k, user can incrase reuseport to incrase the queue. # default: 2000 queue_length 2000; + # The black-hole to copy packet to, for debugging. + # For example, when debugging Chrome publish stream, the received packets are encrypted cipher, + # we can set the publisher black-hole, SRS will copy the plaintext packets to black-hole, and + # we are able to capture the plaintext packets by wireshark. + black_hole { + # Whether enable the black-hole. + enabled off; + # The black-hole address for publisher, or SRS as receiver. + publisher 127.0.0.1:10000; + } } vhost rtc.vhost.srs.com { diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 01db3abc0..cd1e04b96 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -3645,7 +3645,7 @@ srs_error_t SrsConfig::check_normal_config() string n = conf->at(i)->name; if (n != "enabled" && n != "listen" && n != "dir" && n != "candidate" && n != "ecdsa" && n != "sendmmsg" && n != "encrypt" && n != "reuseport" && n != "gso" && n != "merge_nalus" - && n != "padding" && n != "perf_stat" && n != "queue_length") { + && n != "padding" && n != "perf_stat" && n != "queue_length" && n != "black_hole") { return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal rtc_server.%s", n.c_str()); } } @@ -4742,7 +4742,7 @@ std::string SrsConfig::get_rtc_server_candidates() return DEFAULT; } - return (conf->arg0().c_str()); + return conf->arg0(); } bool SrsConfig::get_rtc_server_ecdsa() @@ -4943,6 +4943,50 @@ int SrsConfig::get_rtc_server_queue_length() return ::atoi(conf->arg0().c_str()); } +bool SrsConfig::get_rtc_server_black_hole() +{ + static bool DEFAULT = false; + + SrsConfDirective* conf = root->get("rtc_server"); + if (!conf) { + return DEFAULT; + } + + conf = conf->get("black_hole"); + if (!conf) { + return DEFAULT; + } + + conf = conf->get("enabled"); + if (!conf || conf->arg0().empty()) { + return DEFAULT; + } + + return SRS_CONF_PERFER_FALSE(conf->arg0()); +} + +std::string SrsConfig::get_rtc_server_black_hole_publisher() +{ + static string DEFAULT = ""; + + SrsConfDirective* conf = root->get("rtc_server"); + if (!conf) { + return DEFAULT; + } + + conf = conf->get("black_hole"); + if (!conf) { + return DEFAULT; + } + + conf = conf->get("publisher"); + if (!conf || conf->arg0().empty()) { + return DEFAULT; + } + + return conf->arg0(); +} + SrsConfDirective* SrsConfig::get_rtc(string vhost) { SrsConfDirective* conf = get_vhost(vhost); diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index 04552c3be..ab9ac5ac2 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -534,6 +534,8 @@ public: virtual int get_rtc_server_padding(); virtual bool get_rtc_server_perf_stat(); virtual int get_rtc_server_queue_length(); + virtual bool get_rtc_server_black_hole(); + virtual std::string get_rtc_server_black_hole_publisher(); private: virtual int get_rtc_server_reuseport2(); virtual bool get_rtc_server_gso2(); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 256ef3cf5..83cb0e384 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -62,6 +62,7 @@ using namespace std; #include #include #include +#include // The RTP payload max size, reserved some paddings for SRTP as such: // kRtpPacketSize = kRtpMaxPayloadSize + paddings @@ -290,12 +291,18 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) } } - if (out_bio_len) { + if (out_bio_len) { if ((err = skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { return srs_error_wrap(err, "send dtls packet"); } } + if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + // Ignore any error for black-hole. + void* p = out_bio_data; int len = out_bio_len; SrsRtcSession* s = rtc_session; + srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + return err; } @@ -314,7 +321,13 @@ srs_error_t SrsDtlsSession::on_dtls(SrsUdpMuxSocket* skt) return srs_error_new(ERROR_OpenSslBIOWrite, "BIO_write"); } - if (! handshake_done) { + if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + // Ignore any error for black-hole. + void* p = skt->data(); int len = skt->size(); SrsRtcSession* s = rtc_session; + srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + + if (!handshake_done) { err = handshake(skt); } else { while (BIO_ctrl_pending(bio_in) > 0) { @@ -360,7 +373,7 @@ srs_error_t SrsDtlsSession::srtp_initialize() unsigned char material[SRTP_MASTER_KEY_LEN * 2] = {0}; // client(SRTP_MASTER_KEY_KEY_LEN + SRTP_MASTER_KEY_SALT_LEN) + server static const string dtls_srtp_lable = "EXTRACTOR-dtls_srtp"; - if (! SSL_export_keying_material(dtls, material, sizeof(material), dtls_srtp_lable.c_str(), dtls_srtp_lable.size(), NULL, 0, 0)) { + if (!SSL_export_keying_material(dtls, material, sizeof(material), dtls_srtp_lable.c_str(), dtls_srtp_lable.size(), NULL, 0, 0)) { return srs_error_new(ERROR_RTC_SRTP_INIT, "SSL_export_keying_material failed"); } @@ -1962,7 +1975,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() rtp_audio_queue->get_and_clean_collected_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { - if (! frames[i].empty()) { + if (!frames[i].empty()) { srs_verbose("collect %d audio frames, seq range %u,%u", frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); } @@ -1983,7 +1996,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() rtp_video_queue->get_and_clean_collected_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { - if (! frames[i].empty()) { + if (!frames[i].empty()) { srs_verbose("collect %d video frames, seq range %u,%u", frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); @@ -2011,13 +2024,13 @@ srs_error_t SrsRtcPublisher::collect_video_frame() if (rtp_h264_header->nalu_type != kFuA) { if ((p[0] & kNalTypeMask) == SrsAvcNaluTypeSPS) { string cur_sps = string((char*)p, rtp_h264_header->nalu_offset[j].second); - if (! cur_sps.empty() && sps != cur_sps) { + if (!cur_sps.empty() && sps != cur_sps) { video_header_change = true; sps = cur_sps; } } else if ((p[0] & kNalTypeMask) == SrsAvcNaluTypePPS) { string cur_pps = string((char*)p, rtp_h264_header->nalu_offset[j].second); - if (! cur_pps.empty() && pps != cur_pps) { + if (!cur_pps.empty() && pps != cur_pps) { video_header_change = true; pps = cur_pps; } @@ -2159,6 +2172,10 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& session_state = INIT; last_stun_time = 0; sessionStunTimeout = 0; + + blackhole = false; + blackhole_addr = NULL; + blackhole_stfd = NULL; } SrsRtcSession::~SrsRtcSession() @@ -2167,6 +2184,8 @@ SrsRtcSession::~SrsRtcSession() srs_freep(publisher); srs_freep(dtls_session); srs_freep(req); + srs_close_stfd(blackhole_stfd); + srs_freep(blackhole_addr); } void SrsRtcSession::set_local_sdp(const SrsSdp& sdp) @@ -2191,6 +2210,30 @@ srs_error_t SrsRtcSession::initialize() sessionStunTimeout = _srs_config->get_rtc_stun_timeout(req->vhost); last_stun_time = srs_get_system_time(); + blackhole = _srs_config->get_rtc_server_black_hole(); + + srs_trace("RTC init session, timeout=%dms, blackhole=%d", srsu2msi(sessionStunTimeout), blackhole); + + if (blackhole) { + string blackhole_ep = _srs_config->get_rtc_server_black_hole_publisher(); + if (!blackhole_ep.empty()) { + string host; int port; + srs_parse_hostport(blackhole_ep, host, port); + + srs_freep(blackhole_addr); + blackhole_addr = new sockaddr_in(); + blackhole_addr->sin_family = AF_INET; + blackhole_addr->sin_addr.s_addr = inet_addr(host.c_str()); + blackhole_addr->sin_port = htons(port); + + int fd = socket(AF_INET, SOCK_DGRAM, 0); + blackhole_stfd = srs_netfd_open_socket(fd); + srs_assert(blackhole_stfd); + + srs_trace("RTC blackhole %s:%d, fd=%d", host.c_str(), port, fd); + } + } + return err; } @@ -2274,6 +2317,19 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke srs_trace("rtc session=%s, STUN done, waitting DTLS handshake.", id().c_str()); } + // Write STUN messages to blackhole. + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = skt->data(); int len = skt->size(); + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = stream->data(); int len = stream->pos(); + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + return err; } @@ -2334,7 +2390,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock uint16_t mask = 0x01; for (int i = 1; i < 16 && blp; ++i, mask <<= 1) { - if (! (blp & mask)) { + if (!(blp & mask)) { continue; } @@ -2343,7 +2399,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock // TODO: FIXME: Support ARQ. (void)loss_seq; SrsRtpSharedPacket* pkt = NULL; // source->find_rtp_packet(loss_seq); - if (! pkt) { + if (!pkt) { continue; } @@ -2506,14 +2562,14 @@ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); - if (! local_sdp.media_descs_.empty() && + if (!local_sdp.media_descs_.empty() && (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { if ((err = start_publish(skt)) != srs_success) { return srs_error_wrap(err, "start publish"); } } - if (! local_sdp.media_descs_.empty() && + if (!local_sdp.media_descs_.empty() && (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { if ((err = start_play(skt)) != srs_success) { return srs_error_wrap(err, "start play"); @@ -2568,11 +2624,11 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; if (media_desc.is_audio()) { - if (! media_desc.ssrc_infos_.empty()) { + if (!media_desc.ssrc_infos_.empty()) { audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; } } else if (media_desc.is_video()) { - if (! media_desc.ssrc_infos_.empty()) { + if (!media_desc.ssrc_infos_.empty()) { video_ssrc = media_desc.ssrc_infos_[0].ssrc_; } } @@ -2610,6 +2666,12 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) return srs_error_wrap(err, "rtcp unprotect failed"); } + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = unprotected_buf; int len = nb_unprotected_buf; + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + char* ph = unprotected_buf; int nb_left = nb_unprotected_buf; while (nb_left) { @@ -2683,12 +2745,18 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); } - char* unprotected_buf = new char[1460]; + char* unprotected_buf = new char[kRtpPacketSize]; int nb_unprotected_buf = skt->size(); if ((err = dtls_session->unprotect_rtp(unprotected_buf, skt->data(), nb_unprotected_buf)) != srs_success) { return srs_error_wrap(err, "rtp unprotect failed"); } + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = unprotected_buf; int len = nb_unprotected_buf; + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + return publisher->on_rtp(skt, unprotected_buf, nb_unprotected_buf); } @@ -3110,7 +3178,7 @@ srs_error_t SrsRtcServer::create_rtc_session( local_ufrag = gen_random_str(8); username = local_ufrag + ":" + remote_sdp.get_ice_ufrag(); - if (! map_username_session.count(username)) + if (!map_username_session.count(username)) break; } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 0797a0274..1793b49a4 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -305,6 +305,7 @@ public: class SrsRtcSession { + friend class SrsDtlsSession; friend class SrsRtcSenderThread; friend class SrsRtcPublisher; private: @@ -327,6 +328,10 @@ private: bool encrypt; // The timeout of session, keep alive by STUN ping pong. srs_utime_t sessionStunTimeout; +private: + bool blackhole; + sockaddr_in* blackhole_addr; + srs_netfd_t blackhole_stfd; public: SrsRequest* req; SrsSource* source; From 89cdfe2f50f62f6b4d26029beeefb4eab743cff4 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 27 Apr 2020 13:45:50 +0800 Subject: [PATCH 20/79] Refactor RTC publisher code --- trunk/src/app/srs_app_rtc_conn.cpp | 49 ++++++++++++++++------------- trunk/src/app/srs_app_rtc_conn.hpp | 3 +- trunk/src/app/srs_app_rtp_queue.cpp | 15 +++++---- trunk/src/app/srs_app_rtp_queue.hpp | 2 +- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 83cb0e384..20b003d02 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1935,9 +1935,12 @@ srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* return srs_error_wrap(err, "rtp opus demux failed"); } + // TODO: FIXME: Rename it. + // TODO: FIXME: Error check. rtp_audio_queue->insert(rtp_pkt); - if (rtp_audio_queue->get_and_clean_if_needed_rqeuest_key_frame()) { + if (rtp_audio_queue->get_and_clean_if_needed_request_key_frame()) { + // TODO: FIXME: Check error. send_rtcp_fb_pli(skt, audio_ssrc); } @@ -1946,27 +1949,6 @@ srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* return collect_audio_frame(); } -srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) -{ - srs_error_t err = srs_success; - - rtp_pkt->rtp_payload_header = new SrsRtpH264Header(); - - if ((err = rtp_h264_demuxer->parse(rtp_pkt)) != srs_success) { - return srs_error_wrap(err, "rtp h264 demux failed"); - } - - rtp_video_queue->insert(rtp_pkt); - - if (rtp_video_queue->get_and_clean_if_needed_rqeuest_key_frame()) { - send_rtcp_fb_pli(skt, video_ssrc); - } - - check_send_nacks(rtp_video_queue, video_ssrc, skt); - - return collect_video_frame(); -} - srs_error_t SrsRtcPublisher::collect_audio_frame() { srs_error_t err = srs_success; @@ -1980,6 +1962,8 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); } + // TODO: FIXME: Write audio frame to source. + for (size_t n = 0; n < frames[i].size(); ++n) { srs_freep(frames[i][n]); } @@ -1988,6 +1972,27 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() return err; } +srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +{ + srs_error_t err = srs_success; + + rtp_pkt->rtp_payload_header = new SrsRtpH264Header(); + + if ((err = rtp_h264_demuxer->parse(rtp_pkt)) != srs_success) { + return srs_error_wrap(err, "rtp h264 demux failed"); + } + + rtp_video_queue->insert(rtp_pkt); + + if (rtp_video_queue->get_and_clean_if_needed_request_key_frame()) { + send_rtcp_fb_pli(skt, video_ssrc); + } + + check_send_nacks(rtp_video_queue, video_ssrc, skt); + + return collect_video_frame(); +} + srs_error_t SrsRtcPublisher::collect_video_frame() { srs_error_t err = srs_success; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 1793b49a4..793813abb 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -292,10 +292,11 @@ private: srs_error_t send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc); private: srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); + srs_error_t collect_audio_frame(); +private: srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); private: srs_error_t collect_video_frame(); - srs_error_t collect_audio_frame(); public: void update_sendonly_socket(SrsUdpMuxSocket* skt); // interface ISrsHourGlass diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 942c244aa..bfed41778 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -171,16 +171,18 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) uint16_t seq = rtp_pkt->rtp_header.get_sequence(); + // TODO: FIXME: Update time for each packet, may hurt performance. srs_utime_t now = srs_update_system_time(); // First packet recv, init head_sequence and highest_sequence. - if (! initialized_) { + if (!initialized_) { initialized_ = true; head_sequence_ = seq; highest_sequence_ = seq; ++num_of_packet_received_; + // TODO: FIXME: Covert time to srs_utime_t. last_trans_time_ = now/1000 - rtp_pkt->rtp_header.get_timestamp()/90; } else { SrsRtpNackInfo* nack_info = NULL; @@ -219,7 +221,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) } else { // Because we don't know the ISN(initiazlie sequence number), the first packet // we received maybe no the first packet client sented. - if (! start_collected_) { + if (!start_collected_) { if (seq_cmp(seq, head_sequence_)) { srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", head_sequence_, seq); head_sequence_ = seq; @@ -267,6 +269,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) delete old_pkt; } + // TODO: FIXME: Change to ptr of ptr. old_pkt = rtp_pkt->copy(); // Marker bit means the last packet of frame received. @@ -295,7 +298,7 @@ void SrsRtpQueue::get_and_clean_collected_frames(std::vectorrtp_payload_size() != 0 && ! pkt->rtp_payload_header->is_first_packet_of_frame) { + if (s == head_sequence_ && pkt->rtp_payload_size() != 0 && !pkt->rtp_payload_header->is_first_packet_of_frame) { break; } frame.push_back(pkt->copy()); if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { - if (! start_collected_) { + if (!start_collected_) { start_collected_ = true; } frames_.push_back(frame); diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index f8a31d08f..4b2fb8929 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -142,7 +142,7 @@ public: srs_error_t remove(uint16_t seq); public: void get_and_clean_collected_frames(std::vector >& frames); - bool get_and_clean_if_needed_rqeuest_key_frame(); + bool get_and_clean_if_needed_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); public: From ded37c671976f405657c2e253f0df8b7156a1532 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 27 Apr 2020 13:59:57 +0800 Subject: [PATCH 21/79] Refine build script --- trunk/auto/depends.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index b6d6a644a..352e0addf 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -338,13 +338,13 @@ fi ##################################################################################### if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then # check the cross build flag file, if flag changed, need to rebuild the st. - _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_EPOLL" && _ST_LD=${SRS_TOOL_LD} && _ST_OBJ="LINUX_*" + _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_EPOLL" && _ST_LD=${SRS_TOOL_LD} && _ST_OBJ="LINUX_`uname -r`_DBG" if [[ $SRS_VALGRIND == YES ]]; then _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_VALGRIND" fi # for osx, use darwin for st, donot use epoll. if [[ $SRS_OSX == YES ]]; then - _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_LD=${SRS_TOOL_CC} && _ST_OBJ="DARWIN_*" + _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_LD=${SRS_TOOL_CC} && _ST_OBJ="DARWIN_`uname -r`_DBG" fi # For UDP sendmmsg, disable it if not suppported. if [[ $SRS_SENDMMSG == YES ]]; then From 5eba90ded98b9d92971d409adebd4b029455e6ff Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 29 Apr 2020 19:07:25 +0800 Subject: [PATCH 22/79] Refine build script --- trunk/auto/depends.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index e972c8e07..f9723193f 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -382,7 +382,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then # Build source code. make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" \ CC=${SRS_TOOL_CC} AR=${SRS_TOOL_AR} LD=${_ST_LD} RANDLIB=${SRS_TOOL_RANDLIB} && - cd .. && rm -f st && ln -sf st-srs/${_ST_OBJ} st + cd .. && rm -rf st && ln -sf st-srs/${_ST_OBJ} st ) fi # check status @@ -576,13 +576,13 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then rm -rf libsrtp-2.0.0 && unzip -q ../../3rdparty/libsrtp-2.0.0.zip && cd libsrtp-2.0.0 && ${SRTP_CONFIG} && ./configure ${SRTP_OPTIONS} --prefix=`pwd`/_release && make ${SRS_JOBS} && make install && - cd .. && rm -f srtp2 && ln -sf libsrtp-2.0.0/_release srtp2 + cd .. && rm -rf srtp2 && ln -sf libsrtp-2.0.0/_release srtp2 ) fi # check status ret=$?; if [[ $ret -ne 0 ]]; then echo "Build srtp2 failed, ret=$ret"; exit $ret; fi # Always update the links. - (cd ${SRS_OBJS} && rm -f srtp2 && ln -sf ${SRS_PLATFORM}/libsrtp-2.0.0/_release srtp2) + (cd ${SRS_OBJS} && rm -rf srtp2 && ln -sf ${SRS_PLATFORM}/libsrtp-2.0.0/_release srtp2) if [ ! -f ${SRS_OBJS}/srtp2/lib/libsrtp2.a ]; then echo "Build srtp2 static lib failed."; exit -1; fi fi @@ -604,7 +604,7 @@ if [[ $SRS_EXPORT_LIBRTMP_PROJECT == NO && $SRS_RTC == YES ]]; then # check status ret=$?; if [[ $ret -ne 0 ]]; then echo "Build opus-1.3.1 failed, ret=$ret"; exit $ret; fi # Always update the links. - (cd ${SRS_OBJS} && rm -f opus && ln -sf ${SRS_PLATFORM}/opus-1.3.1/_release opus) + (cd ${SRS_OBJS} && rm -rf opus && ln -sf ${SRS_PLATFORM}/opus-1.3.1/_release opus) if [ ! -f ${SRS_OBJS}/opus/lib/libopus.a ]; then echo "Build opus-1.3.1 failed."; exit -1; fi fi From 2fe1874a875b79b546d3b01a1bea349ab7ccef39 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 29 Apr 2020 19:07:44 +0800 Subject: [PATCH 23/79] For RTC publish, refine the ring buffer. --- trunk/src/app/srs_app_rtp_queue.cpp | 334 ++++++++++++++++------------ trunk/src/app/srs_app_rtp_queue.hpp | 93 +++++--- 2 files changed, 256 insertions(+), 171 deletions(-) diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index bfed41778..28637e738 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -134,20 +134,123 @@ void SrsRtpNackList::update_rtt(int rtt) opts_.nack_interval = rtt_; } +SrsRtpRingBuffer::SrsRtpRingBuffer(size_t capacity) +{ + nn_seq_flip_backs = 0; + high_ = low_ = 0; + capacity_ = capacity; + initialized_ = false; + + queue_ = new SrsRtpSharedPacket*[capacity_]; + memset(queue_, 0, sizeof(SrsRtpSharedPacket*) * capacity); +} + +SrsRtpRingBuffer::~SrsRtpRingBuffer() +{ + srs_freepa(queue_); +} + +void SrsRtpRingBuffer::set(uint16_t at, SrsRtpSharedPacket* pkt) +{ + SrsRtpSharedPacket* p = queue_[at % capacity_]; + + if (p) { + srs_freep(p); + } + + queue_[at % capacity_] = pkt; +} + +void SrsRtpRingBuffer::remove(uint16_t at) +{ + set(at, NULL); +} + +uint16_t SrsRtpRingBuffer::next_start_of_frame() +{ + if (low_ == high_) { + return low_; + } + + for (uint16_t s = low_ + 1 ; s != high_; ++s) { + SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; + if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { + return s; + } + } + + return low_; +} + +uint16_t SrsRtpRingBuffer::next_keyframe() +{ + if (low_ == high_) { + return low_; + } + + for (uint16_t s = low_ + 1 ; s != high_; ++s) { + SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; + if (pkt && pkt->rtp_payload_header->is_key_frame && pkt->rtp_payload_header->is_first_packet_of_frame) { + return s; + } + } + + return low_; +} + +uint32_t SrsRtpRingBuffer::get_extended_highest_sequence() +{ + return nn_seq_flip_backs * 65536 + high_; +} + +void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, uint16_t& nack_high) +{ + if (!initialized_) { + initialized_ = true; + low_ = high_ = seq; + return; + } + + // Normal sequence, seq follows high_. + if (srs_rtp_seq_distance(high_, seq)) { + nack_low = high_ + 1; + nack_high = seq; + + // When distance(seq,high_)>0 and seq0 and 1<65535. + if (seq < high_) { + srs_verbose("warp around, flip_back=%" PRId64, nn_seq_flip_backs); + ++nn_seq_flip_backs; + } + high_ = seq; + return; + } + + // Out-of-order sequence, seq before low_. + if (srs_rtp_seq_distance(seq, low_)) { + // When startup, we may receive packets in chaos order. + // Because we don't know the ISN(initiazlie sequence number), the first packet + // we received maybe no the first packet client sent. + if (startup) { + nack_low = seq + 1; + nack_high = low_; + + srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", low_, seq); + low_ = seq; + } else { + srs_verbose("seq=%u, rtx success, too old", seq); + } + } +} + SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) : nack_(this, capacity * 2 / 3) { - capacity_ = capacity; - head_sequence_ = 0; - highest_sequence_ = 0; - initialized_ = false; - start_collected_ = false; - queue_ = new SrsRtpSharedPacket*[capacity_]; - memset(queue_, 0, sizeof(SrsRtpSharedPacket*) * capacity); + nn_collected_frames = 0; + queue_ = new SrsRtpRingBuffer(capacity); - cycle_ = 0; jitter_ = 0; - last_trans_time_ = 0; + last_trans_time_ = -1; pre_number_of_packet_received_ = 0; pre_number_of_packet_lossed_ = 0; @@ -162,137 +265,91 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) SrsRtpQueue::~SrsRtpQueue() { - srs_freepa(queue_); + srs_freep(queue_); } srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) { srs_error_t err = srs_success; - uint16_t seq = rtp_pkt->rtp_header.get_sequence(); - // TODO: FIXME: Update time for each packet, may hurt performance. srs_utime_t now = srs_update_system_time(); - // First packet recv, init head_sequence and highest_sequence. - if (!initialized_) { - initialized_ = true; - head_sequence_ = seq; - highest_sequence_ = seq; + uint16_t seq = rtp_pkt->rtp_header.get_sequence(); + SrsRtpNackInfo* nack_info = nack_.find(seq); + if (nack_info) { + int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; + (void)nack_rtt; + srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", + seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); + nack_.remove(seq); + } + // Calc jitter time, ignore nack packets. + // TODO: FIXME: Covert time to srs_utime_t. + if (last_trans_time_ == -1) { + last_trans_time_ = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; + } else if (!nack_info) { + int trans_time = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; + + int cur_jitter = trans_time - last_trans_time_; + if (cur_jitter < 0) { + cur_jitter = -cur_jitter; + } + + last_trans_time_ = trans_time; + + jitter_ = (jitter_ * 15.0 / 16.0) + (static_cast(cur_jitter) / 16.0); + srs_verbose("jitter=%.2f", jitter_); + } + + // OK, we got one new RTP packet, which is not in NACK. + if (!nack_info) { ++num_of_packet_received_; - - // TODO: FIXME: Covert time to srs_utime_t. - last_trans_time_ = now/1000 - rtp_pkt->rtp_header.get_timestamp()/90; - } else { - SrsRtpNackInfo* nack_info = NULL; - if ((nack_info = nack_.find(seq)) != NULL) { - int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; - (void)nack_rtt; - srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", - seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); - nack_.remove(seq); - } else { - // Calc jitter. - { - int trans_time = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; - - int cur_jitter = trans_time - last_trans_time_; - if (cur_jitter < 0) { - cur_jitter = -cur_jitter; - } - - last_trans_time_ = trans_time; - - jitter_ = (jitter_ * 15.0 / 16.0) + (static_cast(cur_jitter) / 16.0); - srs_verbose("jitter=%.2f", jitter_); - } - - ++num_of_packet_received_; - // seq > highest_sequence_ - if (seq_cmp(highest_sequence_, seq)) { - insert_into_nack_list(highest_sequence_ + 1, seq); - - if (seq < highest_sequence_) { - srs_verbose("warp around, cycle=%lu", cycle_); - ++cycle_; - } - highest_sequence_ = seq; - } else { - // Because we don't know the ISN(initiazlie sequence number), the first packet - // we received maybe no the first packet client sented. - if (!start_collected_) { - if (seq_cmp(seq, head_sequence_)) { - srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", head_sequence_, seq); - head_sequence_ = seq; - } - insert_into_nack_list(seq + 1, highest_sequence_); - } else { - srs_verbose("seq=%u, rtx success, too old", seq); - } - } + uint16_t nack_low = 0, nack_high = 0; + queue_->update(seq, !nn_collected_frames, nack_low, nack_high); + if (srs_rtp_seq_distance(nack_low, nack_high)) { + srs_trace("update nack seq=%u, startup=%d, nack range [%u, %u]", seq, !nn_collected_frames, nack_low, nack_high); + insert_into_nack_list(nack_low, nack_high); } } - // Check seqs out of range. - if (head_sequence_ + capacity_ < highest_sequence_) { + // When packets overflow, collect frame and move head to next frame start. + if (queue_->overflow()) { srs_verbose("try collect packet becuase seq out of range"); collect_packet(); - } - while (head_sequence_ + capacity_ < highest_sequence_) { - srs_trace("seqs out of range, head seq=%u, hightest seq=%u", head_sequence_, highest_sequence_); - remove(head_sequence_); - uint16_t s = head_sequence_ + 1; - for ( ; s != highest_sequence_; ++s) { - SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; - // Choose the new head sequence. Must be the first packet of frame. - if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { - srs_trace("find except, update head seq from %u to %u when seqs out of range", head_sequence_, s); - head_sequence_ = s; - break; - } - // Drop the seq. - nack_.remove(s); - srs_verbose("seqs out of range, drop seq=%u", s); - if (pkt && pkt->rtp_header.get_sequence() == s) { - delete pkt; - pkt = NULL; - } + uint16_t next = queue_->next_start_of_frame(); + + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; } - srs_trace("force update, update head seq from %u to %u when seqs out of range", head_sequence_, s); - head_sequence_ = s; - } + srs_trace("seqs out of range, seq range [%u, %u]", queue_->low(), next); - SrsRtpSharedPacket*& old_pkt = queue_[seq % capacity_]; - if (old_pkt) { - delete old_pkt; + for (uint16_t s = queue_->low(); s != next; ++s) { + nack_.remove(s); + queue_->remove(s); + } + + srs_trace("force update, update head seq from %u to %u when seqs out of range", queue_->low(), next + 1); + queue_->advance_to(next + 1); } // TODO: FIXME: Change to ptr of ptr. - old_pkt = rtp_pkt->copy(); + queue_->set(seq, rtp_pkt->copy()); - // Marker bit means the last packet of frame received. - if (rtp_pkt->rtp_header.get_marker() || (highest_sequence_ - head_sequence_ >= capacity_ / 2) || one_packet_per_frame_) { + // Collect packets to frame when: + // 1. Marker bit means the last packet of frame received. + // 2. Queue has lots of packets, the load is heavy. + // 3. The frame contains only one packet for each frame. + if (rtp_pkt->rtp_header.get_marker() || queue_->is_heavy() || one_packet_per_frame_) { collect_packet(); } return err; } -srs_error_t SrsRtpQueue::remove(uint16_t seq) -{ - srs_error_t err = srs_success; - - SrsRtpSharedPacket*& pkt = queue_[seq % capacity_]; - if (pkt && pkt->rtp_header.get_sequence() == seq) { - delete pkt; - pkt = NULL; - } - - return err; -} - void SrsRtpQueue::get_and_clean_collected_frames(std::vector >& frames) { frames.swap(frames_); @@ -309,44 +366,35 @@ bool SrsRtpQueue::get_and_clean_if_needed_request_key_frame() void SrsRtpQueue::notify_drop_seq(uint16_t seq) { - uint16_t s = seq + 1; - for ( ; s != highest_sequence_; ++s) { - SrsRtpSharedPacket* pkt = queue_[s % capacity_]; - if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { - break; - } + uint16_t next = queue_->next_start_of_frame(); + + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; } - srs_verbose("drop seq=%u, highest seq=%u, update head seq %u to %u", seq, highest_sequence_, head_sequence_, s); - head_sequence_ = s; + // When NACK is timeout, move to the next start of frame. + srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); + queue_->advance_to(next + 1); } void SrsRtpQueue::notify_nack_list_full() { - bool found_key_frame = false; - while (head_sequence_ <= highest_sequence_) { - SrsRtpSharedPacket* pkt = queue_[head_sequence_ % capacity_]; - if (pkt && pkt->rtp_payload_header->is_key_frame && pkt->rtp_payload_header->is_first_packet_of_frame) { - found_key_frame = true; - srs_verbose("found firsr packet of key frame, seq=%u", head_sequence_); - break; - } + uint16_t next = queue_->next_keyframe(); - nack_.remove(head_sequence_); - remove(head_sequence_); - ++head_sequence_; + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; } - if (!found_key_frame) { - srs_verbose("no found first packet of key frame, request key frame"); - request_key_frame_ = true; - head_sequence_ = highest_sequence_; - } + // When NACK is overflow, move to the next keyframe. + srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); + queue_->advance_to(next + 1); } uint32_t SrsRtpQueue::get_extended_highest_sequence() { - return cycle_ * 65536 + highest_sequence_; + return queue_->get_extended_highest_sequence(); } uint8_t SrsRtpQueue::get_fraction_lost() @@ -392,8 +440,8 @@ void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) void SrsRtpQueue::collect_packet() { vector frame; - for (uint16_t s = head_sequence_; s != highest_sequence_; ++s) { - SrsRtpSharedPacket* pkt = queue_[s % capacity_]; + for (uint16_t s = queue_->low(); s != queue_->high(); ++s) { + SrsRtpSharedPacket* pkt = queue_->at(s); if (nack_.find(s) != NULL) { srs_verbose("seq=%u, found in nack list when collect frame", s); @@ -401,20 +449,18 @@ void SrsRtpQueue::collect_packet() } // We must collect frame from first packet to last packet. - if (s == head_sequence_ && pkt->rtp_payload_size() != 0 && !pkt->rtp_payload_header->is_first_packet_of_frame) { + if (s == queue_->low() && pkt->rtp_payload_size() != 0 && !pkt->rtp_payload_header->is_first_packet_of_frame) { break; } frame.push_back(pkt->copy()); if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { - if (!start_collected_) { - start_collected_ = true; - } + nn_collected_frames++; frames_.push_back(frame); frame.clear(); - srs_verbose("head seq=%u, update to %u because collect one full farme", head_sequence_, s + 1); - head_sequence_ = s + 1; + srs_verbose("head seq=%u, update to %u because collect one full farme", queue_->low(), s + 1); + queue_->advance_to(s + 1); } } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 4b2fb8929..70631e801 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -61,21 +61,24 @@ struct SrsRtpNackInfo int req_nack_count_; }; -inline bool seq_cmp(const uint16_t& l, const uint16_t& r) +// The "distance" between two uint16 number, for example: +// distance(low=3, high=5) === (int16_t)(uint16_t)((uint16_t)3-(uint16_t)5) === -2 +// distance(low=3, high=65534) === (int16_t)(uint16_t)((uint16_t)3-(uint16_t)65534) === 5 +// distance(low=65532, high=65534) === (int16_t)(uint16_t)((uint16_t)65532-(uint16_t)65534) === -2 +// For RTP sequence, it's only uint16 and may flip back, so 3 maybe 3+0xffff. +inline bool srs_rtp_seq_distance(const uint16_t& low, const uint16_t& high) { - return ((int16_t)(r - l)) > 0; + return ((int16_t)(high - low)) > 0; } -struct SeqComp -{ - bool operator()(const uint16_t& l, const uint16_t& r) const - { - return seq_cmp(l, r); - } -}; - class SrsRtpNackList { +private: + struct SeqComp { + bool operator()(const uint16_t& low, const uint16_t& high) const { + return srs_rtp_seq_distance(low, high); + } + }; private: // Nack queue, seq order, oldest to newest. std::map queue_; @@ -101,27 +104,64 @@ public: void update_rtt(int rtt); }; +// For UDP, the packets sequence may present as bellow: +// [seq1(done)|seq2|seq3 ... seq10|seq11(lost)|seq12|seq13] +// \___(head_sequence_) \ \___(highest_sequence_) +// \___(no received, in nack list) +// * seq1: The packet is done, we already got the entire frame and processed it. +// * seq2,seq3,...,seq10,seq12,seq13: We are processing theses packets, for example, some FU-A or NALUs, +// but not an entire video frame right now. +// * seq10: This packet is lost or not received, we put it in the nack list. +// We store the received packets in ring buffer. +class SrsRtpRingBuffer +{ +private: + // Capacity of the ring-buffer. + uint16_t capacity_; + // Ring bufer. + SrsRtpSharedPacket** queue_; + // Increase one when uint16 flip back, for get_extended_highest_sequence. + uint64_t nn_seq_flip_backs; + // Whether initialized, because we use uint16 so we can't use -1. + bool initialized_; +private: + // Current position we are working at. + uint16_t low_; + uint16_t high_; +public: + SrsRtpRingBuffer(size_t capacity); + virtual ~SrsRtpRingBuffer(); +public: + uint16_t low() { return low_; } + uint16_t high() { return high_; } + void advance_to(uint16_t seq) { low_ = seq; } + void set(uint16_t at, SrsRtpSharedPacket* pkt); + void remove(uint16_t at); + bool overflow() { return low_ + capacity_ < high_; } + bool is_heavy() { return high_ - low_ >= capacity_ / 2; } + // Get the next start packet of frame. + // @remark If not found, return the low_, which should never be the "next" one, + // because it MAY or NOT current start packet of frame but never be the next. + uint16_t next_start_of_frame(); + // Get the next seq of keyframe. + // @remark Return low_ if not found. + uint16_t next_keyframe(); + // The highest sequence number, calculate the flip back base. + uint32_t get_extended_highest_sequence(); + // Update the sequence, got the nack range by [low, high]. + void update(uint16_t seq, bool startup, uint16_t& nack_low, uint16_t& nack_high); + // Get the packet by seq. + SrsRtpSharedPacket* at(uint16_t seq) { return queue_[seq % capacity_]; } +}; + class SrsRtpQueue { private: - /* - *[seq1|seq2|seq3|seq4|seq5 ... seq10|seq11(loss)|seq12(loss)|seq13] - * \___(head_sequence_) \ \___(highest_sequence_) - * \___(no received, in nack list) - */ - // Capacity of the ring-buffer. - uint16_t capacity_; - // Thei highest sequence we have receive. - uint16_t highest_sequence_; - // The sequence waitting to read. - uint16_t head_sequence_; - bool initialized_; - bool start_collected_; - // Ring bufer. - SrsRtpSharedPacket** queue_; + uint64_t nn_collected_frames; + SrsRtpRingBuffer* queue_; private: - uint64_t cycle_; double jitter_; + // TODO: FIXME: Covert time to srs_utime_t. int64_t last_trans_time_; uint64_t pre_number_of_packet_received_; uint64_t pre_number_of_packet_lossed_; @@ -139,7 +179,6 @@ public: virtual ~SrsRtpQueue(); public: srs_error_t insert(SrsRtpSharedPacket* rtp_pkt); - srs_error_t remove(uint16_t seq); public: void get_and_clean_collected_frames(std::vector >& frames); bool get_and_clean_if_needed_request_key_frame(); From ed338f4c0a0276b933d717e3b65b3e74367fc5a6 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 29 Apr 2020 20:02:28 +0800 Subject: [PATCH 24/79] Refactor macro SRS_AUTO_XXX to SRS_XXX. --- trunk/auto/auto_headers.sh | 96 ++++++++++++------------- trunk/src/app/srs_app_config.cpp | 2 +- trunk/src/app/srs_app_ffmpeg.cpp | 2 +- trunk/src/app/srs_app_ffmpeg.hpp | 2 +- trunk/src/app/srs_app_hds.cpp | 2 +- trunk/src/app/srs_app_hds.hpp | 2 +- trunk/src/app/srs_app_hls.cpp | 8 +-- trunk/src/app/srs_app_http_api.cpp | 20 +++--- trunk/src/app/srs_app_http_api.hpp | 6 +- trunk/src/app/srs_app_ingest.cpp | 4 +- trunk/src/app/srs_app_rtc_conn.cpp | 6 +- trunk/src/app/srs_app_server.cpp | 34 ++++----- trunk/src/app/srs_app_server.hpp | 4 +- trunk/src/app/srs_app_source.cpp | 36 +++++----- trunk/src/app/srs_app_source.hpp | 12 ++-- trunk/src/app/srs_app_utility.cpp | 20 +++--- trunk/src/core/srs_core.hpp | 7 +- trunk/src/core/srs_core_mem_watch.cpp | 2 +- trunk/src/core/srs_core_mem_watch.hpp | 2 +- trunk/src/kernel/srs_kernel_flv.cpp | 14 ++-- trunk/src/kernel/srs_kernel_flv.hpp | 4 +- trunk/src/kernel/srs_kernel_log.hpp | 6 +- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/kernel/srs_kernel_utility.hpp | 2 +- trunk/src/main/srs_main_ingest_hls.cpp | 4 +- trunk/src/main/srs_main_server.cpp | 46 ++++++------ trunk/src/service/srs_service_st.cpp | 4 +- trunk/src/service/srs_service_st.hpp | 4 +- trunk/src/utest/srs_utest_core.cpp | 14 ++-- trunk/src/utest/srs_utest_kernel.cpp | 4 +- trunk/src/utest/srs_utest_service.cpp | 20 +++--- 31 files changed, 193 insertions(+), 198 deletions(-) diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index d77325395..bcbfe95b8 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -11,11 +11,11 @@ echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H echo "" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_USER_CONFIGURE \"${SRS_AUTO_USER_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_CONFIGURE \"${SRS_AUTO_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_USER_CONFIGURE \"${SRS_AUTO_USER_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_CONFIGURE \"${SRS_AUTO_CONFIGURE}\"" >> $SRS_AUTO_HEADERS_H echo "" >> $SRS_AUTO_HEADERS_H function srs_define_macro() @@ -62,73 +62,73 @@ echo "" >> $SRS_AUTO_HEADERS_H ##################################################################################### # auto headers in depends. if [ $SRS_HDS = YES ]; then - srs_define_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_HDS" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_HDS" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_HDS" $SRS_AUTO_HEADERS_H fi if [ $SRS_SRT = YES ]; then - srs_define_macro "SRS_AUTO_SRT" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_SRT" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_SRT" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_SRT" $SRS_AUTO_HEADERS_H fi if [ $SRS_RTC = YES ]; then - srs_define_macro "SRS_AUTO_RTC" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_RTC" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_RTC" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_RTC" $SRS_AUTO_HEADERS_H fi if [ $SRS_GB28181 = YES ]; then - srs_define_macro "SRS_AUTO_GB28181" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GB28181" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GB28181" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GB28181" $SRS_AUTO_HEADERS_H fi if [ $SRS_MEM_WATCH = YES ]; then - srs_define_macro "SRS_AUTO_MEM_WATCH" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_MEM_WATCH" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_MEM_WATCH" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_MEM_WATCH" $SRS_AUTO_HEADERS_H fi if [ $SRS_UTEST = YES ]; then - srs_define_macro "SRS_AUTO_UTEST" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_UTEST" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_UTEST" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_UTEST" $SRS_AUTO_HEADERS_H fi # whatever the FFMPEG tools, if transcode and ingest specified, # srs always compile the FFMPEG tool stub which used to start the FFMPEG process. if [ $SRS_FFMPEG_STUB = YES ]; then - srs_define_macro "SRS_AUTO_FFMPEG_STUB" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_FFMPEG_STUB" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_FFMPEG_STUB" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_FFMPEG_STUB" $SRS_AUTO_HEADERS_H fi if [ $SRS_GPERF = YES ]; then - srs_define_macro "SRS_AUTO_GPERF" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GPERF" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GPERF" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GPERF" $SRS_AUTO_HEADERS_H fi if [ $SRS_GPERF_MC = YES ]; then - srs_define_macro "SRS_AUTO_GPERF_MC" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GPERF_MC" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GPERF_MC" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GPERF_MC" $SRS_AUTO_HEADERS_H fi if [ $SRS_GPERF_MD = YES ]; then - srs_define_macro "SRS_AUTO_GPERF_MD" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GPERF_MD" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GPERF_MD" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GPERF_MD" $SRS_AUTO_HEADERS_H fi if [ $SRS_GPERF_MP = YES ]; then - srs_define_macro "SRS_AUTO_GPERF_MP" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GPERF_MP" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GPERF_MP" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GPERF_MP" $SRS_AUTO_HEADERS_H fi if [ $SRS_GPERF_CP = YES ]; then - srs_define_macro "SRS_AUTO_GPERF_CP" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_GPERF_CP" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_GPERF_CP" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_GPERF_CP" $SRS_AUTO_HEADERS_H fi ##################################################################################### @@ -136,50 +136,50 @@ fi ##################################################################################### # for log level compile settings if [ $SRS_LOG_VERBOSE = YES ]; then - srs_define_macro "SRS_AUTO_VERBOSE" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_VERBOSE" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_VERBOSE" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_VERBOSE" $SRS_AUTO_HEADERS_H fi if [ $SRS_LOG_INFO = YES ]; then - srs_define_macro "SRS_AUTO_INFO" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_INFO" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_INFO" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_INFO" $SRS_AUTO_HEADERS_H fi if [ $SRS_LOG_TRACE = YES ]; then - srs_define_macro "SRS_AUTO_TRACE" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_TRACE" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_TRACE" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_TRACE" $SRS_AUTO_HEADERS_H fi if [ $SRS_CROSS_BUILD = YES ]; then - srs_define_macro "SRS_AUTO_CROSSBUILD" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_CROSSBUILD" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_CROSSBUILD" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_CROSSBUILD" $SRS_AUTO_HEADERS_H fi if [ $SRS_OSX = YES ]; then - srs_define_macro "SRS_AUTO_OSX" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_OSX" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_OSX" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_OSX" $SRS_AUTO_HEADERS_H fi if [ $SRS_SENDMMSG = YES ]; then - srs_define_macro "SRS_AUTO_SENDMMSG" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_SENDMMSG" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_SENDMMSG" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_SENDMMSG" $SRS_AUTO_HEADERS_H fi if [ $SRS_HAS_SENDMMSG = YES ]; then - srs_define_macro "SRS_AUTO_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H fi if [ $SRS_DEBUG = YES ]; then - srs_define_macro "SRS_AUTO_DEBUG" $SRS_AUTO_HEADERS_H + srs_define_macro "SRS_DEBUG" $SRS_AUTO_HEADERS_H else - srs_undefine_macro "SRS_AUTO_DEBUG" $SRS_AUTO_HEADERS_H + srs_undefine_macro "SRS_DEBUG" $SRS_AUTO_HEADERS_H fi # prefix echo "" >> $SRS_AUTO_HEADERS_H -echo "#define SRS_AUTO_PREFIX \"${SRS_PREFIX}\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_PREFIX \"${SRS_PREFIX}\"" >> $SRS_AUTO_HEADERS_H echo "" >> $SRS_AUTO_HEADERS_H @@ -188,13 +188,13 @@ echo "" >> $SRS_AUTO_HEADERS_H ##################################################################################### if [[ -f ../AUTHORS.txt ]]; then SRS_CONSTRIBUTORS=`cat ../AUTHORS.txt|grep "*"|awk '{print $2}'` - echo "#define SRS_AUTO_CONSTRIBUTORS \"\\" >> $SRS_AUTO_HEADERS_H + echo "#define SRS_CONSTRIBUTORS \"\\" >> $SRS_AUTO_HEADERS_H for CONTRIBUTOR in $SRS_CONSTRIBUTORS; do echo "${CONTRIBUTOR} \\" >> $SRS_AUTO_HEADERS_H done echo "\"" >> $SRS_AUTO_HEADERS_H else - echo "#define SRS_AUTO_CONSTRIBUTORS \"ossrs\"" >> $SRS_AUTO_HEADERS_H + echo "#define SRS_CONSTRIBUTORS \"ossrs\"" >> $SRS_AUTO_HEADERS_H fi # new empty line to auto headers file. diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index cd1e04b96..12c990cf4 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -4781,7 +4781,7 @@ bool SrsConfig::get_rtc_server_encrypt() int SrsConfig::get_rtc_server_sendmmsg() { -#if !defined(SRS_AUTO_HAS_SENDMMSG) || !defined(SRS_AUTO_SENDMMSG) +#if !defined(SRS_HAS_SENDMMSG) || !defined(SRS_SENDMMSG) return 1; #else static int DEFAULT = 256; diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp index 1cde4f5f9..3acb1708d 100644 --- a/trunk/src/app/srs_app_ffmpeg.cpp +++ b/trunk/src/app/srs_app_ffmpeg.cpp @@ -45,7 +45,7 @@ using namespace std; #include #include -#ifdef SRS_AUTO_FFMPEG_STUB +#ifdef SRS_FFMPEG_STUB #define SRS_RTMP_ENCODER_COPY "copy" #define SRS_RTMP_ENCODER_NO_VIDEO "vn" diff --git a/trunk/src/app/srs_app_ffmpeg.hpp b/trunk/src/app/srs_app_ffmpeg.hpp index 452b7a564..9e068acbb 100644 --- a/trunk/src/app/srs_app_ffmpeg.hpp +++ b/trunk/src/app/srs_app_ffmpeg.hpp @@ -26,7 +26,7 @@ #include -#ifdef SRS_AUTO_FFMPEG_STUB +#ifdef SRS_FFMPEG_STUB #include #include diff --git a/trunk/src/app/srs_app_hds.cpp b/trunk/src/app/srs_app_hds.cpp index a260e9470..75f028933 100644 --- a/trunk/src/app/srs_app_hds.cpp +++ b/trunk/src/app/srs_app_hds.cpp @@ -23,7 +23,7 @@ #include -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS #include #include diff --git a/trunk/src/app/srs_app_hds.hpp b/trunk/src/app/srs_app_hds.hpp index 93ef16a17..58236cea4 100644 --- a/trunk/src/app/srs_app_hds.hpp +++ b/trunk/src/app/srs_app_hds.hpp @@ -26,7 +26,7 @@ #include -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS #include diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 7470acf2a..a4ff08afa 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -55,7 +55,7 @@ using namespace std; // drop the segment when duration of ts too small. // TODO: FIXME: Refine to time unit. -#define SRS_AUTO_HLS_SEGMENT_MIN_DURATION (100 * SRS_UTIME_MILLISECONDS) +#define SRS_HLS_SEGMENT_MIN_DURATION (100 * SRS_UTIME_MILLISECONDS) // fragment plus the deviation percent. #define SRS_HLS_FLOOR_REAP_PERCENT 0.3 @@ -498,7 +498,7 @@ bool SrsHlsMuxer::is_segment_overflow() srs_assert(current); // to prevent very small segment. - if (current->duration() < 2 * SRS_AUTO_HLS_SEGMENT_MIN_DURATION) { + if (current->duration() < 2 * SRS_HLS_SEGMENT_MIN_DURATION) { return false; } @@ -518,7 +518,7 @@ bool SrsHlsMuxer::is_segment_absolutely_overflow() srs_assert(current); // to prevent very small segment. - if (current->duration() < 2 * SRS_AUTO_HLS_SEGMENT_MIN_DURATION) { + if (current->duration() < 2 * SRS_HLS_SEGMENT_MIN_DURATION) { return false; } @@ -619,7 +619,7 @@ srs_error_t SrsHlsMuxer::do_segment_close() // when too small, it maybe not enough data to play. // when too large, it maybe timestamp corrupt. // make the segment more acceptable, when in [min, max_td * 2], it's ok. - bool matchMinDuration = current->duration() >= SRS_AUTO_HLS_SEGMENT_MIN_DURATION; + bool matchMinDuration = current->duration() >= SRS_HLS_SEGMENT_MIN_DURATION; bool matchMaxDuration = current->duration() <= max_td * 2 * 1000; if (matchMinDuration && matchMaxDuration) { // use async to call the http hooks, for it will cause thread switch. diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 797ba63c7..f836b1bc8 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -46,7 +46,7 @@ using namespace std; #include #include #include -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC #include #endif @@ -556,7 +556,7 @@ srs_error_t SrsGoApiAuthors::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa obj->set("data", data); data->set("license", SrsJsonAny::str(RTMP_SIG_SRS_LICENSE)); - data->set("contributors", SrsJsonAny::str(SRS_AUTO_CONSTRIBUTORS)); + data->set("contributors", SrsJsonAny::str(SRS_CONSTRIBUTORS)); return srs_api_response(w, r, obj->dumps()); } @@ -582,17 +582,17 @@ srs_error_t SrsGoApiFeatures::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMess SrsJsonObject* data = SrsJsonAny::object(); obj->set("data", data); - data->set("options", SrsJsonAny::str(SRS_AUTO_USER_CONFIGURE)); - data->set("options2", SrsJsonAny::str(SRS_AUTO_CONFIGURE)); - data->set("build", SrsJsonAny::str(SRS_AUTO_BUILD_DATE)); - data->set("build2", SrsJsonAny::str(SRS_AUTO_BUILD_TS)); + data->set("options", SrsJsonAny::str(SRS_USER_CONFIGURE)); + data->set("options2", SrsJsonAny::str(SRS_CONFIGURE)); + data->set("build", SrsJsonAny::str(SRS_BUILD_DATE)); + data->set("build2", SrsJsonAny::str(SRS_BUILD_TS)); SrsJsonObject* features = SrsJsonAny::object(); data->set("features", features); features->set("ssl", SrsJsonAny::boolean(true)); features->set("hls", SrsJsonAny::boolean(true)); -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS features->set("hds", SrsJsonAny::boolean(true)); #else features->set("hds", SrsJsonAny::boolean(false)); @@ -785,7 +785,7 @@ srs_error_t SrsGoApiStreams::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa return srs_api_response(w, r, obj->dumps()); } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC uint32_t SrsGoApiRtcPlay::ssrc_num = 0; SrsGoApiRtcPlay::SrsGoApiRtcPlay(SrsRtcServer* rtc_svr) @@ -2045,7 +2045,7 @@ srs_error_t SrsGoApiError::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage return srs_api_response_code(w, r, 100); } -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 SrsGoApiGb28181::SrsGoApiGb28181() { } @@ -2228,7 +2228,7 @@ srs_error_t SrsGoApiGb28181::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe } #endif -#ifdef SRS_AUTO_GPERF +#ifdef SRS_GPERF #include SrsGoApiTcmalloc::SrsGoApiTcmalloc() diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index f38e4a58f..ae1467fd1 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -167,7 +167,7 @@ public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); }; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC class SrsGoApiRtcPlay : public ISrsHttpHandler { public: @@ -258,7 +258,7 @@ public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); }; -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 class SrsGoApiGb28181 : public ISrsHttpHandler { public: @@ -271,7 +271,7 @@ private: }; #endif -#ifdef SRS_AUTO_GPERF +#ifdef SRS_GPERF class SrsGoApiTcmalloc : public ISrsHttpHandler { public: diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index 44987f16c..b255d6be7 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -194,7 +194,7 @@ void SrsIngester::fast_kill() // when error, ingester sleep for a while and retry. // ingest never sleep a long time, for we must start the stream ASAP. -#define SRS_AUTO_INGESTER_CIMS (3 * SRS_UTIME_SECONDS) +#define SRS_INGESTER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsIngester::cycle() { @@ -212,7 +212,7 @@ srs_error_t SrsIngester::cycle() srs_freep(err); } - srs_usleep(SRS_AUTO_INGESTER_CIMS); + srs_usleep(SRS_INGESTER_CIMS); } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 20b003d02..2570b91a7 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -890,7 +890,7 @@ srs_error_t SrsRtcSenderThread::send_messages( return srs_error_wrap(err, "messages to packets"); } -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX // If enabled GSO, send out some packets in a msghdr. if (packets.use_gso) { if ((err = send_packets_gso(packets)) != srs_success) { @@ -1223,7 +1223,7 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen; mhdr->msg_hdr.msg_controllen = 0; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX if (using_gso) { mhdr->msg_hdr.msg_controllen = CMSG_SPACE(sizeof(uint16_t)); if (!mhdr->msg_hdr.msg_control) { @@ -2273,7 +2273,7 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req return err; } -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX // These functions are similar to the older byteorder(3) family of functions. // For example, be32toh() is identical to ntohl(). // @see https://linux.die.net/man/3/be32toh diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 224f4790e..7e65e1d10 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -30,7 +30,7 @@ #include #include #include -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX #include #endif using namespace std; @@ -349,7 +349,7 @@ SrsUdpCasterListener::~SrsUdpCasterListener() srs_freep(caster); } -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 SrsGb28181Listener::SrsGb28181Listener(SrsServer* svr, SrsListenerType t, SrsConfDirective* c) : SrsUdpStreamListener(svr, t, NULL) { @@ -514,7 +514,7 @@ srs_error_t SrsInotifyWorker::start() { srs_error_t err = srs_success; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX // Whether enable auto reload config. bool auto_reload = _srs_config->inotify_auto_reload(); if (!auto_reload && _srs_in_docker && _srs_config->auto_reload_for_docker()) { @@ -594,7 +594,7 @@ srs_error_t SrsInotifyWorker::cycle() { srs_error_t err = srs_success; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX string config_path = _srs_config->config(); string config_file = srs_path_basename(config_path); string k8s_file = "..data"; @@ -695,7 +695,7 @@ void SrsServer::destroy() srs_freep(signal_manager); srs_freep(conn_manager); -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 //free global gb28181 manager srs_freep(_srs_gb28181); #endif @@ -721,7 +721,7 @@ void SrsServer::dispose() // @remark don't dispose all connections, for too slow. -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH srs_memory_report(); #endif } @@ -763,7 +763,7 @@ void SrsServer::gracefully_dispose() _srs_sources->dispose(); srs_trace("source disposed"); -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH srs_memory_report(); #endif @@ -992,7 +992,7 @@ srs_error_t SrsServer::http_handle() if ((err = http_api_mux->handle("/api/v1/perf", new SrsGoApiPerf())) != srs_success) { return srs_error_wrap(err, "handle perf"); } -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 if ((err = http_api_mux->handle("/api/v1/gb28181", new SrsGoApiGb28181())) != srs_success) { return srs_error_wrap(err, "handle raw"); } @@ -1015,7 +1015,7 @@ srs_error_t SrsServer::http_handle() return srs_error_wrap(err, "handle tests errors for error.srs.com"); } -#ifdef SRS_AUTO_GPERF +#ifdef SRS_GPERF // The test api for get tcmalloc stats. // @see Memory Introspection in https://gperftools.github.io/gperftools/tcmalloc.html if ((err = http_api_mux->handle("/api/v1/tcmalloc", new SrsGoApiTcmalloc())) != srs_success) { @@ -1058,7 +1058,7 @@ srs_error_t SrsServer::cycle() // Do server main cycle. err = do_cycle(); -#ifdef SRS_AUTO_GPERF_MC +#ifdef SRS_GPERF_MC destroy(); // remark, for gmc, never invoke the exit(). @@ -1104,7 +1104,7 @@ void SrsServer::on_signal(int signo) return; } -#ifndef SRS_AUTO_GPERF_MC +#ifndef SRS_GPERF_MC if (signo == SRS_SIGNAL_REOPEN_LOG) { _srs_log->reopen(); srs_warn("reopen log file, signo=%d", signo); @@ -1112,7 +1112,7 @@ void SrsServer::on_signal(int signo) } #endif -#ifdef SRS_AUTO_GPERF_MC +#ifdef SRS_GPERF_MC if (signo == SRS_SIGNAL_REOPEN_LOG) { signal_gmc_stop = true; srs_warn("for gmc, the SIGUSR1 used as SIGINT, signo=%d", signo); @@ -1126,11 +1126,11 @@ void SrsServer::on_signal(int signo) } if (signo == SIGINT) { -#ifdef SRS_AUTO_GPERF_MC +#ifdef SRS_GPERF_MC srs_trace("gmc is on, main cycle will terminate normally, signo=%d", signo); signal_gmc_stop = true; #else - #ifdef SRS_AUTO_MEM_WATCH + #ifdef SRS_MEM_WATCH srs_memory_report(); #endif #endif @@ -1206,7 +1206,7 @@ srs_error_t SrsServer::do_cycle() // if user interrupt the program, exit to check mem leak. // but, if gperf, use reload to ensure main return normally, // because directly exit will cause core-dump. -#ifdef SRS_AUTO_GPERF_MC +#ifdef SRS_GPERF_MC if (signal_gmc_stop) { srs_warn("gmc got singal to stop server."); return err; @@ -1359,7 +1359,7 @@ srs_error_t SrsServer::listen_http_stream() return err; } -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 srs_error_t SrsServer::listen_gb28181_sip(SrsConfDirective* stream_caster) { srs_error_t err = srs_success; @@ -1410,7 +1410,7 @@ srs_error_t SrsServer::listen_stream_caster() } else if (srs_stream_caster_is_flv(caster)) { listener = new SrsHttpFlvListener(this, SrsListenerFlv, stream_caster); } else if (srs_stream_caster_is_gb28181(caster)) { -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 //init global gb28181 manger if (_srs_gb28181 == NULL){ _srs_gb28181 = new SrsGb28181Manger(stream_caster); diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 1147a5a35..e2cff8f72 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -164,7 +164,7 @@ public: virtual ~SrsUdpCasterListener(); }; -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 // A UDP gb28181 listener, for sip and rtp stream mux server. class SrsGb28181Listener : public SrsUdpStreamListener @@ -323,7 +323,7 @@ private: virtual srs_error_t listen_http_api(); virtual srs_error_t listen_http_stream(); virtual srs_error_t listen_stream_caster(); -#ifdef SRS_AUTO_GB28181 +#ifdef SRS_GB28181 virtual srs_error_t listen_gb28181_sip(SrsConfDirective* c); #endif // Close the listeners for specified type, diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index c0548708f..3f543915a 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -50,7 +50,7 @@ using namespace std; #include #include #include -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC #include #endif @@ -843,7 +843,7 @@ SrsSharedPtrMessage* SrsMixQueue::pop() return msg; } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC SrsRtpPacketQueue::SrsRtpPacketQueue() { } @@ -905,10 +905,10 @@ SrsOriginHub::SrsOriginHub() dash = new SrsDash(); dvr = new SrsDvr(); encoder = new SrsEncoder(); -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC rtc = new SrsRtc(); #endif -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS hds = new SrsHds(); #endif ng_exec = new SrsNgExec(); @@ -936,7 +936,7 @@ SrsOriginHub::~SrsOriginHub() srs_freep(dash); srs_freep(dvr); srs_freep(encoder); -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS srs_freep(hds); #endif } @@ -952,7 +952,7 @@ srs_error_t SrsOriginHub::initialize(SrsSource* s, SrsRequest* r) return srs_error_wrap(err, "format initialize"); } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC if ((err = rtc->initialize(this, req)) != srs_success) { return srs_error_wrap(err, "rtc initialize"); } @@ -1056,7 +1056,7 @@ srs_error_t SrsOriginHub::on_audio(SrsSharedPtrMessage* shared_audio) srs_flv_srates[c->sound_rate]); } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC if ((err = rtc->on_audio(msg, format)) != srs_success) { srs_warn("rtc: ignore audio error %s", srs_error_desc(err).c_str()); srs_error_reset(err); @@ -1095,7 +1095,7 @@ srs_error_t SrsOriginHub::on_audio(SrsSharedPtrMessage* shared_audio) dvr->on_unpublish(); } -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS if ((err = hds->on_audio(msg)) != srs_success) { srs_warn("hds: ignore audio error %s", srs_error_desc(err).c_str()); srs_error_reset(err); @@ -1157,7 +1157,7 @@ srs_error_t SrsOriginHub::on_video(SrsSharedPtrMessage* shared_video, bool is_se return err; } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // Parse RTMP message to RTP packets, in FU-A if too large. if ((err = rtc->on_video(msg, format)) != srs_success) { // TODO: We should support more strategies. @@ -1204,7 +1204,7 @@ srs_error_t SrsOriginHub::on_video(SrsSharedPtrMessage* shared_video, bool is_se dvr->on_unpublish(); } -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS if ((err = hds->on_video(msg)) != srs_success) { srs_warn("hds: ignore video error %s", srs_error_desc(err).c_str()); srs_error_reset(err); @@ -1240,7 +1240,7 @@ srs_error_t SrsOriginHub::on_publish() return srs_error_wrap(err, "encoder publish"); } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC if ((err = rtc->on_publish()) != srs_success) { return srs_error_wrap(err, "rtc publish"); } @@ -1259,7 +1259,7 @@ srs_error_t SrsOriginHub::on_publish() } // TODO: FIXME: use initialize to set req. -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS if ((err = hds->on_publish(req)) != srs_success) { return srs_error_wrap(err, "hds publish"); } @@ -1283,14 +1283,14 @@ void SrsOriginHub::on_unpublish() destroy_forwarders(); encoder->on_unpublish(); -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC rtc->on_unpublish(); #endif hls->on_unpublish(); dash->on_unpublish(); dvr->on_unpublish(); -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS hds->on_unpublish(); #endif @@ -1479,7 +1479,7 @@ srs_error_t SrsOriginHub::on_reload_vhost_hds(string vhost) // TODO: FIXME: maybe should ignore when publish already stopped? -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS hds->on_unpublish(); // Don't start HDS when source is not active. @@ -1947,7 +1947,7 @@ SrsSource::SrsSource() jitter_algorithm = SrsRtmpJitterAlgorithmOFF; mix_correct = false; mix_queue = new SrsMixQueue(); -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC rtp_queue = new SrsRtpPacketQueue(); #endif @@ -1979,7 +1979,7 @@ SrsSource::~SrsSource() srs_freep(hub); srs_freep(meta); srs_freep(mix_queue); -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC srs_freep(rtp_queue); #endif @@ -2739,7 +2739,7 @@ string SrsSource::get_curr_origin() return play_edge->get_curr_origin(); } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC SrsRtpSharedPacket* SrsSource::find_rtp_packet(const uint16_t& seq) { return rtp_queue->find(seq); diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index fdfe9c789..fcc6c84d4 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -59,7 +59,7 @@ class SrsDvr; class SrsDash; class SrsEncoder; class SrsBuffer; -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS class SrsHds; #endif class SrsRtpSharedPacket; @@ -333,7 +333,7 @@ public: virtual SrsSharedPtrMessage* pop(); }; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // To find the RTP packet for RTX or restore. // TODO: FIXME: Should queue RTP packets in connection level. class SrsRtpPacketQueue @@ -371,7 +371,7 @@ private: private: // The format, codec information. SrsRtmpFormat* format; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // rtc handler SrsRtc* rtc; #endif @@ -383,7 +383,7 @@ private: SrsDvr* dvr; // transcoding handler. SrsEncoder* encoder; -#ifdef SRS_AUTO_HDS +#ifdef SRS_HDS // adobe hds(http dynamic streaming). SrsHds *hds; #endif @@ -547,7 +547,7 @@ private: bool mix_correct; // The mix queue to implements the mix correct algorithm. SrsMixQueue* mix_queue; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // rtp packet queue SrsRtpPacketQueue* rtp_queue; #endif @@ -640,7 +640,7 @@ public: public: virtual std::string get_curr_origin(); public: -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // Find rtp packet by sequence SrsRtpSharedPacket* find_rtp_packet(const uint16_t& seq); // Get the cached meta, as such the sps/pps. diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index 0fc17ce41..dfb845b91 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -35,7 +35,7 @@ #include #include #include -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX #include #endif using namespace std; @@ -329,7 +329,7 @@ SrsProcSystemStat* srs_get_system_proc_stat() bool get_proc_system_stat(SrsProcSystemStat& r) { -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX FILE* f = fopen("/proc/stat", "r"); if (f == NULL) { srs_warn("open system cpu stat failed, ignore"); @@ -368,7 +368,7 @@ bool get_proc_system_stat(SrsProcSystemStat& r) bool get_proc_self_stat(SrsProcSelfStat& r) { -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX FILE* f = fopen("/proc/self/stat", "r"); if (f == NULL) { srs_warn("open self cpu stat failed, ignore"); @@ -491,7 +491,7 @@ SrsDiskStat* srs_get_disk_stat() bool srs_get_disk_vmstat_stat(SrsDiskStat& r) { -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX FILE* f = fopen("/proc/vmstat", "r"); if (f == NULL) { srs_warn("open vmstat failed, ignore"); @@ -523,7 +523,7 @@ bool srs_get_disk_diskstats_stat(SrsDiskStat& r) r.ok = true; r.sample_time = srsu2ms(srs_get_system_time()); -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX // if disabled, ignore all devices. SrsConfDirective* conf = _srs_config->get_stats_disk_device(); if (conf == NULL) { @@ -687,7 +687,7 @@ void srs_update_meminfo() { SrsMemInfo& r = _srs_system_meminfo; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX FILE* f = fopen("/proc/meminfo", "r"); if (f == NULL) { srs_warn("open meminfo failed, ignore"); @@ -781,7 +781,7 @@ void srs_update_platform_info() r.srs_startup_time = srsu2ms(srs_get_system_startup_time()); -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/uptime", "r"); if (f == NULL) { @@ -893,7 +893,7 @@ int srs_get_network_devices_count() void srs_update_network_devices() { -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/dev", "r"); if (f == NULL) { @@ -978,7 +978,7 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) int nb_tcp_mem = 0; int nb_udp4 = 0; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/sockstat", "r"); if (f == NULL) { @@ -1021,7 +1021,7 @@ void srs_update_rtmp_server(int nb_conn, SrsKbps* kbps) int nb_tcp_estab = 0; -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX if (true) { FILE* f = fopen("/proc/net/snmp", "r"); if (f == NULL) { diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 725c1bff4..051eb7ae0 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -33,11 +33,6 @@ // The macros generated by configure script. #include -// Alias for debug. -#ifdef SRS_AUTO_DEBUG -#define SRS_DEBUG -#endif - // To convert macro values to string. // @see https://gcc.gnu.org/onlinedocs/cpp/Stringification.html#Stringification #define SRS_INTERNAL_STR(v) #v @@ -68,7 +63,7 @@ #endif // For RTC/FFMPEG build. -#if defined(SRS_AUTO_RTC) && !defined(__STDC_CONSTANT_MACROS) +#if defined(SRS_RTC) && !defined(__STDC_CONSTANT_MACROS) #define __STDC_CONSTANT_MACROS #endif diff --git a/trunk/src/core/srs_core_mem_watch.cpp b/trunk/src/core/srs_core_mem_watch.cpp index dbc6c9411..bc39e8523 100644 --- a/trunk/src/core/srs_core_mem_watch.cpp +++ b/trunk/src/core/srs_core_mem_watch.cpp @@ -23,7 +23,7 @@ #include -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH #include #include diff --git a/trunk/src/core/srs_core_mem_watch.hpp b/trunk/src/core/srs_core_mem_watch.hpp index d10bbb675..bbd154a15 100644 --- a/trunk/src/core/srs_core_mem_watch.hpp +++ b/trunk/src/core/srs_core_mem_watch.hpp @@ -26,7 +26,7 @@ #include -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH #warning "MemoryWatch is deprecated." diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp index eead02374..594f5598e 100644 --- a/trunk/src/kernel/srs_kernel_flv.cpp +++ b/trunk/src/kernel/srs_kernel_flv.cpp @@ -40,7 +40,7 @@ using namespace std; #include #include #include -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC #include #endif @@ -164,7 +164,7 @@ SrsCommonMessage::SrsCommonMessage() SrsCommonMessage::~SrsCommonMessage() { -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH srs_memory_unwatch(payload); #endif srs_freepa(payload); @@ -177,7 +177,7 @@ void SrsCommonMessage::create_payload(int size) payload = new char[size]; srs_verbose("create payload for RTMP message. size=%d", size); -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH srs_memory_watch(payload, "RTMP.msg.payload", size); #endif } @@ -211,7 +211,7 @@ SrsSharedPtrMessage::SrsSharedPtrPayload::SrsSharedPtrPayload() size = 0; shared_count = 0; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC samples = NULL; nn_samples = 0; has_idr = false; @@ -224,12 +224,12 @@ SrsSharedPtrMessage::SrsSharedPtrPayload::SrsSharedPtrPayload() SrsSharedPtrMessage::SrsSharedPtrPayload::~SrsSharedPtrPayload() { -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH srs_memory_unwatch(payload); #endif srs_freepa(payload); -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC srs_freepa(samples); for (int i = 0; i < nn_extra_payloads; i++) { @@ -376,7 +376,7 @@ SrsSharedPtrMessage* SrsSharedPtrMessage::copy() return copy; } -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC void SrsSharedPtrMessage::set_extra_payloads(SrsSample* payloads, int nn_payloads) { srs_assert(nn_payloads); diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index 8cfda3557..f92ad6655 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -302,7 +302,7 @@ private: int size; // The reference count int shared_count; -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC public: // For RTC video, we need to know the NALU structures, // because the RTP STAP-A or FU-A based on NALU. @@ -361,7 +361,7 @@ public: // @remark, assert object is created. virtual SrsSharedPtrMessage* copy(); public: -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC // Set extra samples, for example, when we transcode an AAC audio packet to OPUS, // we may get more than one OPUS packets, we set these OPUS packets in extra payloads. void set_extra_payloads(SrsSample* payloads, int nn_payloads); diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp index 1d7af37bb..cd877104d 100644 --- a/trunk/src/kernel/srs_kernel_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -129,15 +129,15 @@ extern ISrsThreadContext* _srs_context; #endif // TODO: FIXME: Add more verbose and info logs. -#ifndef SRS_AUTO_VERBOSE +#ifndef SRS_VERBOSE #undef srs_verbose #define srs_verbose(msg, ...) (void)0 #endif -#ifndef SRS_AUTO_INFO +#ifndef SRS_INFO #undef srs_info #define srs_info(msg, ...) (void)0 #endif -#ifndef SRS_AUTO_TRACE +#ifndef SRS_TRACE #undef srs_trace #define srs_trace(msg, ...) (void)0 #endif diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 1d91b72bd..72e2d705e 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -124,7 +124,7 @@ srs_utime_t srs_get_system_startup_time() } // For utest to mock it. -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX _srs_gettimeofday_t _srs_gettimeofday = ::gettimeofday; #endif diff --git a/trunk/src/kernel/srs_kernel_utility.hpp b/trunk/src/kernel/srs_kernel_utility.hpp index c63937430..8dc54894c 100644 --- a/trunk/src/kernel/srs_kernel_utility.hpp +++ b/trunk/src/kernel/srs_kernel_utility.hpp @@ -166,7 +166,7 @@ extern int srs_chunk_header_c3(int perfer_cid, uint32_t timestamp, char* cache, // For utest to mock it. #include -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX #define _srs_gettimeofday gettimeofday #else typedef int (*_srs_gettimeofday_t) (struct timeval* tv, struct timezone* tz); diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index d5f8c458a..34eb3a7da 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -63,8 +63,8 @@ int main(int argc, char** argv) srs_assert(srs_is_little_endian()); // directly failed when compile limited. -#if defined(SRS_AUTO_GPERF_MP) || defined(SRS_AUTO_GPERF_MP) \ - || defined(SRS_AUTO_GPERF_MC) || defined(SRS_AUTO_GPERF_MP) +#if defined(SRS_GPERF_MP) || defined(SRS_GPERF_MP) \ + || defined(SRS_GPERF_MC) || defined(SRS_GPERF_MP) srs_error("donot support gmc/gmp/gcp/gprof"); exit(-1); #endif diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 8195d0020..307476752 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -30,14 +30,14 @@ #include using namespace std; -#ifdef SRS_AUTO_GPERF_MP +#ifdef SRS_GPERF_MP #include #endif -#ifdef SRS_AUTO_GPERF_CP +#ifdef SRS_GPERF_CP #include #endif -#ifdef SRS_AUTO_GPERF +#ifdef SRS_GPERF #include #endif @@ -54,11 +54,11 @@ using namespace std; #include #include #include -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC #include #endif -#ifdef SRS_AUTO_SRT +#ifdef SRS_SRT #include #endif @@ -88,15 +88,15 @@ srs_error_t do_main(int argc, char** argv) // for gperf gmp or gcp, // should never enable it when not enabled for performance issue. -#ifdef SRS_AUTO_GPERF_MP +#ifdef SRS_GPERF_MP HeapProfilerStart("gperf.srs.gmp"); #endif -#ifdef SRS_AUTO_GPERF_CP +#ifdef SRS_GPERF_CP ProfilerStart("gperf.srs.gcp"); #endif // directly compile error when these two macro defines. -#if defined(SRS_AUTO_GPERF_MC) && defined(SRS_AUTO_GPERF_MP) +#if defined(SRS_GPERF_MC) && defined(SRS_GPERF_MP) #error ("option --with-gmc confict with --with-gmp, " "@see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\n" "Note that since the heap-checker uses the heap-profiling framework internally, " @@ -104,7 +104,7 @@ srs_error_t do_main(int argc, char** argv) #endif // never use gmp to check memory leak. -#ifdef SRS_AUTO_GPERF_MP +#ifdef SRS_GPERF_MP #warning "gmp is not used for memory leak, please use gmc instead." #endif @@ -132,12 +132,12 @@ srs_error_t do_main(int argc, char** argv) // config already applied to log. srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS); - srs_trace("contributors: %s", SRS_AUTO_CONSTRIBUTORS); + srs_trace("contributors: %s", SRS_CONSTRIBUTORS); srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d", - _srs_config->cwd().c_str(), cwd.c_str(), SRS_AUTO_BUILD_DATE, SRS_AUTO_USER_CONFIGURE, SRS_AUTO_UNAME, SRS_AUTO_OSX_BOOL); - srs_trace("configure detail: " SRS_AUTO_CONFIGURE); -#ifdef SRS_AUTO_EMBEDED_TOOL_CHAIN - srs_trace("crossbuild tool chain: " SRS_AUTO_EMBEDED_TOOL_CHAIN); + _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL); + srs_trace("configure detail: " SRS_CONFIGURE); +#ifdef SRS_EMBEDED_TOOL_CHAIN + srs_trace("crossbuild tool chain: " SRS_EMBEDED_TOOL_CHAIN); #endif // for memory check or detect. @@ -157,7 +157,7 @@ srs_error_t do_main(int argc, char** argv) ss << "glic mem-check env MALLOC_CHECK_ " << mcov << "=>" << mcnv << ", LIBC_FATAL_STDERR_ " << lfsov << "=>" << lfsnv << "."; #endif -#ifdef SRS_AUTO_GPERF_MC +#ifdef SRS_GPERF_MC string hcov = srs_getenv("HEAPCHECK"); if (hcov.empty()) { string cpath = _srs_config->config(); @@ -167,7 +167,7 @@ srs_error_t do_main(int argc, char** argv) } #endif -#ifdef SRS_AUTO_GPERF_MD +#ifdef SRS_GPERF_MD char* TCMALLOC_PAGE_FENCE = getenv("TCMALLOC_PAGE_FENCE"); if (!TCMALLOC_PAGE_FENCE || strcmp(TCMALLOC_PAGE_FENCE, "1")) { srs_warn("gmd enabled without env TCMALLOC_PAGE_FENCE=1"); @@ -190,7 +190,7 @@ srs_error_t do_main(int argc, char** argv) // features show_macro_features(); -#ifdef SRS_AUTO_GPERF +#ifdef SRS_GPERF // For tcmalloc, use slower release rate. if (true) { double trr = _srs_config->tcmalloc_release_rate(); @@ -233,8 +233,8 @@ void show_macro_features() ss << ", rch:" << srs_bool2switch(true); ss << ", dash:" << "on"; ss << ", hls:" << srs_bool2switch(true); - ss << ", hds:" << srs_bool2switch(SRS_AUTO_HDS_BOOL); - ss << ", srt:" << srs_bool2switch(SRS_AUTO_SRT_BOOL); + ss << ", hds:" << srs_bool2switch(SRS_HDS_BOOL); + ss << ", srt:" << srs_bool2switch(SRS_SRT_BOOL); // hc(http callback) ss << ", hc:" << srs_bool2switch(true); // ha(http api) @@ -272,7 +272,7 @@ void show_macro_features() #if defined(__aarch64__) ss << " aarch64"; #endif -#if defined(SRS_AUTO_CROSSBUILD) +#if defined(SRS_CROSSBUILD) ss << "(crossbuild)"; #endif @@ -345,7 +345,7 @@ void show_macro_features() srs_trace("system default latency(ms): mw(0-%d) + mr(0-%d) + play-queue(0-%d)", srsu2msi(SRS_PERF_MW_SLEEP), possible_mr_latency, srsu2msi(SRS_PERF_PLAY_QUEUE)); -#ifdef SRS_AUTO_MEM_WATCH +#ifdef SRS_MEM_WATCH #warning "srs memory watcher will hurts performance. user should kill by SIGTERM or init.d script." srs_warn("srs memory watcher will hurts performance. user should kill by SIGTERM or init.d script."); #endif @@ -461,11 +461,11 @@ srs_error_t run_hybrid_server() // Create servers and register them. _srs_hybrid->register_server(new SrsServerAdapter()); -#ifdef SRS_AUTO_SRT +#ifdef SRS_SRT _srs_hybrid->register_server(new SrtServerAdapter()); #endif -#ifdef SRS_AUTO_RTC +#ifdef SRS_RTC _srs_hybrid->register_server(new RtcServerAdapter()); #endif diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index d806db24e..73e2252ac 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -115,7 +115,7 @@ srs_error_t srs_fd_reuseport(int fd) #if defined(SO_REUSEPORT) int v = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &v, sizeof(int)) == -1) { - #ifdef SRS_AUTO_CROSSBUILD + #ifdef SRS_CROSSBUILD srs_warn("SO_REUSEPORT disabled for crossbuild"); return srs_success; #else @@ -414,7 +414,7 @@ int srs_sendmsg(srs_netfd_t stfd, const struct msghdr *msg, int flags, srs_utime int srs_sendmmsg(srs_netfd_t stfd, struct mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout) { -#if !defined(SRS_AUTO_HAS_SENDMMSG) || !defined(SRS_AUTO_SENDMMSG) +#if !defined(SRS_HAS_SENDMMSG) || !defined(SRS_SENDMMSG) // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html for (int i = 0; i < (int)vlen; ++i) { struct mmsghdr* p = msgvec + i; diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 0986d553e..7d789b2cc 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -92,7 +92,7 @@ extern int srs_sendto(srs_netfd_t stfd, void *buf, int len, const struct sockadd extern int srs_recvmsg(srs_netfd_t stfd, struct msghdr *msg, int flags, srs_utime_t timeout); extern int srs_sendmsg(srs_netfd_t stfd, const struct msghdr *msg, int flags, srs_utime_t timeout); -#if !defined(SRS_AUTO_HAS_SENDMMSG) +#if !defined(SRS_HAS_SENDMMSG) // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html #include struct mmsghdr { @@ -110,7 +110,7 @@ extern bool srs_is_never_timeout(srs_utime_t tm); // The mutex locker. #define SrsLocker(instance) \ - impl__SrsLocker _srs_auto_free_##instance(&instance) + impl__SrsLocker _SRS_free_##instance(&instance) class impl__SrsLocker { diff --git a/trunk/src/utest/srs_utest_core.cpp b/trunk/src/utest/srs_utest_core.cpp index 2dce41d36..40ed33243 100644 --- a/trunk/src/utest/srs_utest_core.cpp +++ b/trunk/src/utest/srs_utest_core.cpp @@ -41,25 +41,25 @@ VOID TEST(CoreAutoFreeTest, Free) VOID TEST(CoreMacroseTest, Check) { -#ifndef SRS_AUTO_BUILD_TS +#ifndef SRS_BUILD_TS EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_BUILD_DATE +#ifndef SRS_BUILD_DATE EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_UNAME +#ifndef SRS_UNAME EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_USER_CONFIGURE +#ifndef SRS_USER_CONFIGURE EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_CONFIGURE +#ifndef SRS_CONFIGURE EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_PREFIX +#ifndef SRS_PREFIX EXPECT_TRUE(false); #endif -#ifndef SRS_AUTO_CONSTRIBUTORS +#ifndef SRS_CONSTRIBUTORS EXPECT_TRUE(false); #endif } diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index 7607dfcc3..e7cd4d506 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -3843,7 +3843,7 @@ VOID TEST(KernelFileWriterTest, WriteSpecialCase) off_t seeked = 0; HELPER_EXPECT_SUCCESS(f.lseek(0, SEEK_CUR, &seeked)); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX EXPECT_EQ(10, seeked); #else EXPECT_EQ(0, seeked); @@ -4212,7 +4212,7 @@ VOID TEST(KernelUtilityTest, CoverBitsBufferAll) } } -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX extern _srs_gettimeofday_t _srs_gettimeofday; int mock_gettimeofday(struct timeval* /*tp*/, struct timezone* /*tzp*/) { return -1; diff --git a/trunk/src/utest/srs_utest_service.cpp b/trunk/src/utest/srs_utest_service.cpp index da8c8cec0..9bfef5084 100644 --- a/trunk/src/utest/srs_utest_service.cpp +++ b/trunk/src/utest/srs_utest_service.cpp @@ -124,7 +124,7 @@ VOID TEST(TCPServerTest, PingPong) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -146,7 +146,7 @@ VOID TEST(TCPServerTest, PingPong) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -170,7 +170,7 @@ VOID TEST(TCPServerTest, PingPong) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -205,7 +205,7 @@ VOID TEST(TCPServerTest, PingPongWithTimeout) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -227,7 +227,7 @@ VOID TEST(TCPServerTest, PingPongWithTimeout) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -249,7 +249,7 @@ VOID TEST(TCPServerTest, PingPongWithTimeout) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -382,7 +382,7 @@ VOID TEST(TCPServerTest, StringIsHex) char* str = (char*)"!1234567890"; char* parsed = str; errno = 0; EXPECT_EQ(0x0, ::strtol(str, &parsed, 16)); -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX EXPECT_EQ(0, errno); #endif EXPECT_EQ(str, parsed); @@ -400,7 +400,7 @@ VOID TEST(TCPServerTest, StringIsHex) char* str = (char*)""; char* parsed = str; errno = 0; EXPECT_EQ(0x0, ::strtol(str, &parsed, 16)); -#ifndef SRS_AUTO_OSX +#ifndef SRS_OSX EXPECT_EQ(0, errno); #endif EXPECT_EQ(str, parsed); @@ -429,7 +429,7 @@ VOID TEST(TCPServerTest, WritevIOVC) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); @@ -459,7 +459,7 @@ VOID TEST(TCPServerTest, WritevIOVC) SrsStSocket skt; srs_usleep(100 * SRS_UTIME_MILLISECONDS); -#ifdef SRS_AUTO_OSX +#ifdef SRS_OSX ASSERT_TRUE(h.fd != NULL); #endif HELPER_EXPECT_SUCCESS(skt.initialize(h.fd)); From f37ffdf7401de7b5e279957c1ea61b5469ba827e Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 08:24:15 +0800 Subject: [PATCH 25/79] For RTC publisher, request keyframe when start playing --- trunk/src/app/srs_app_rtc_conn.cpp | 23 ++++++++++++++--- trunk/src/app/srs_app_rtc_conn.hpp | 2 ++ trunk/src/app/srs_app_rtp_queue.cpp | 39 +++++++++++++++++------------ trunk/src/app/srs_app_rtp_queue.hpp | 11 ++++---- trunk/src/app/srs_app_source.cpp | 12 +++++++++ trunk/src/app/srs_app_source.hpp | 14 ++++++++++- 6 files changed, 76 insertions(+), 25 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 2570b91a7..00cd9928b 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -794,6 +794,9 @@ srs_error_t SrsRtcSenderThread::cycle() srs_trace("RTC source url=%s, source_id=[%d][%d], encrypt=%d, realtime=%d, mw_sleep=%dms, mw_msgs=%d", req->get_stream_url().c_str(), ::getpid(), source->source_id(), rtc_session->encrypt, realtime, srsu2msi(mw_sleep), mw_msgs); + // For RTC, notify the source to fetch keyframe for this client. + source->request_keyframe(); + SrsMessageArray msgs(SRS_PERF_MW_MSGS); SrsRtcPackets pkts(SRS_PERF_RTC_RTP_PACKETS); @@ -1517,6 +1520,8 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) SrsRtcPublisher::~SrsRtcPublisher() { + source->set_rtc_publisher(NULL); + // TODO: FIXME: Do unpublish when session timeout. if (source) { source->on_unpublish(); @@ -1559,6 +1564,8 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui return srs_error_wrap(err, "on publish"); } + source->set_rtc_publisher(this); + return err; } @@ -1745,7 +1752,7 @@ void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, Sr } vector nack_seqs; - rtp_queue->nack_.get_nack_seqs(nack_seqs); + rtp_queue->get_nack_seqs(nack_seqs); vector::iterator iter = nack_seqs.begin(); while (iter != nack_seqs.end()) { char buf[kRtpPacketSize]; @@ -1912,7 +1919,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr stream.write_4bytes(ssrc); stream.write_4bytes(ssrc); - srs_verbose("PLI ssrc=%u", ssrc); + srs_trace("RTC PLI ssrc=%u", ssrc); char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); @@ -1985,6 +1992,7 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_video_queue->insert(rtp_pkt); if (rtp_video_queue->get_and_clean_if_needed_request_key_frame()) { + // TODO: FIXME: Check error. send_rtcp_fb_pli(skt, video_ssrc); } @@ -2148,6 +2156,15 @@ void SrsRtcPublisher::update_sendonly_socket(SrsUdpMuxSocket* skt) sendonly_ukt = skt->copy_sendonly(); } +void SrsRtcPublisher::request_keyframe() +{ + int scid = _srs_context->get_id(); + int pcid = rtc_session->context_id(); + srs_trace("RTC play=[%d][%d] request keyframe from publish=[%d][%d]", ::getpid(), scid, ::getpid(), pcid); + + rtp_video_queue->request_keyframe(); +} + srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) { if (sendonly_ukt) { @@ -3172,7 +3189,7 @@ srs_error_t SrsRtcServer::create_rtc_session( } // TODO: FIXME: Refine the API for stream status manage. - if (!source->can_publish(false)) { + if (publish && !source->can_publish(false)) { return srs_error_new(ERROR_RTC_SOURCE_BUSY, "stream %s busy", req->get_stream_url().c_str()); } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 793813abb..42bbe0f6e 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -299,6 +299,7 @@ private: srs_error_t collect_video_frame(); public: void update_sendonly_socket(SrsUdpMuxSocket* skt); + void request_keyframe(); // interface ISrsHourGlass public: virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); @@ -359,6 +360,7 @@ public: void set_encrypt(bool v) { encrypt = v; } void switch_to_context(); + int context_id() { return cid; } public: srs_error_t initialize(); srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 28637e738..3e5d3a8cb 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -41,7 +41,7 @@ SrsRtpNackInfo::SrsRtpNackInfo() req_nack_count_ = 0; } -SrsRtpNackList::SrsRtpNackList(SrsRtpQueue* rtp_queue, size_t queue_size) +SrsRtpNackForReceiver::SrsRtpNackForReceiver(SrsRtpQueue* rtp_queue, size_t queue_size) { max_queue_size_ = queue_size; rtp_queue_ = rtp_queue; @@ -51,23 +51,23 @@ SrsRtpNackList::SrsRtpNackList(SrsRtpQueue* rtp_queue, size_t queue_size) max_queue_size_, opts_.max_count, opts_.max_alive_time, opts.first_nack_interval, opts_.nack_interval); } -SrsRtpNackList::~SrsRtpNackList() +SrsRtpNackForReceiver::~SrsRtpNackForReceiver() { } -void SrsRtpNackList::insert(uint16_t seq) +void SrsRtpNackForReceiver::insert(uint16_t seq) { // FIXME: full, drop packet, and request key frame. SrsRtpNackInfo& nack_info = queue_[seq]; (void)nack_info; } -void SrsRtpNackList::remove(uint16_t seq) +void SrsRtpNackForReceiver::remove(uint16_t seq) { queue_.erase(seq); } -SrsRtpNackInfo* SrsRtpNackList::find(uint16_t seq) +SrsRtpNackInfo* SrsRtpNackForReceiver::find(uint16_t seq) { std::map::iterator iter = queue_.find(seq); @@ -78,7 +78,7 @@ SrsRtpNackInfo* SrsRtpNackList::find(uint16_t seq) return &(iter->second); } -void SrsRtpNackList::check_queue_size() +void SrsRtpNackForReceiver::check_queue_size() { if (queue_.size() >= max_queue_size_) { srs_verbose("NACK list full, queue size=%u, max_queue_size=%u", queue_.size(), max_queue_size_); @@ -86,7 +86,7 @@ void SrsRtpNackList::check_queue_size() } } -void SrsRtpNackList::get_nack_seqs(vector& seqs) +void SrsRtpNackForReceiver::get_nack_seqs(vector& seqs) { srs_utime_t now = srs_update_system_time(); int interval = now - pre_check_time_; @@ -126,7 +126,7 @@ void SrsRtpNackList::get_nack_seqs(vector& seqs) } } -void SrsRtpNackList::update_rtt(int rtt) +void SrsRtpNackForReceiver::update_rtt(int rtt) { rtt_ = rtt * SRS_UTIME_MILLISECONDS; srs_verbose("NACK, update rtt from %ld to %d", opts_.nack_interval, rtt_); @@ -244,10 +244,10 @@ void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, ui } SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) - : nack_(this, capacity * 2 / 3) { nn_collected_frames = 0; queue_ = new SrsRtpRingBuffer(capacity); + nack_ = new SrsRtpNackForReceiver(this, capacity * 2 / 3); jitter_ = 0; last_trans_time_ = -1; @@ -266,6 +266,7 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) SrsRtpQueue::~SrsRtpQueue() { srs_freep(queue_); + srs_freep(nack_); } srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) @@ -276,13 +277,13 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) srs_utime_t now = srs_update_system_time(); uint16_t seq = rtp_pkt->rtp_header.get_sequence(); - SrsRtpNackInfo* nack_info = nack_.find(seq); + SrsRtpNackInfo* nack_info = nack_->find(seq); if (nack_info) { int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; (void)nack_rtt; srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); - nack_.remove(seq); + nack_->remove(seq); } // Calc jitter time, ignore nack packets. @@ -328,7 +329,7 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) srs_trace("seqs out of range, seq range [%u, %u]", queue_->low(), next); for (uint16_t s = queue_->low(); s != next; ++s) { - nack_.remove(s); + nack_->remove(s); queue_->remove(s); } @@ -359,6 +360,7 @@ bool SrsRtpQueue::get_and_clean_if_needed_request_key_frame() { if (request_key_frame_) { request_key_frame_ = false; + return true; } return request_key_frame_; @@ -421,20 +423,25 @@ uint32_t SrsRtpQueue::get_interarrival_jitter() return static_cast(jitter_); } +void SrsRtpQueue::get_nack_seqs(vector& seqs) +{ + nack_->get_nack_seqs(seqs); +} + void SrsRtpQueue::update_rtt(int rtt) { - nack_.update_rtt(rtt); + nack_->update_rtt(rtt); } void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) { for (uint16_t s = seq_start; s != seq_end; ++s) { srs_verbose("loss seq=%u, insert into nack list", s); - nack_.insert(s); + nack_->insert(s); ++number_of_packet_lossed_; } - nack_.check_queue_size(); + nack_->check_queue_size(); } void SrsRtpQueue::collect_packet() @@ -443,7 +450,7 @@ void SrsRtpQueue::collect_packet() for (uint16_t s = queue_->low(); s != queue_->high(); ++s) { SrsRtpSharedPacket* pkt = queue_->at(s); - if (nack_.find(s) != NULL) { + if (nack_->find(s) != NULL) { srs_verbose("seq=%u, found in nack list when collect frame", s); break; } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 70631e801..7483f297b 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -71,7 +71,7 @@ inline bool srs_rtp_seq_distance(const uint16_t& low, const uint16_t& high) return ((int16_t)(high - low)) > 0; } -class SrsRtpNackList +class SrsRtpNackForReceiver { private: struct SeqComp { @@ -91,8 +91,8 @@ private: private: int rtt_; public: - SrsRtpNackList(SrsRtpQueue* rtp_queue, size_t queue_size); - virtual ~SrsRtpNackList(); + SrsRtpNackForReceiver(SrsRtpQueue* rtp_queue, size_t queue_size); + virtual ~SrsRtpNackForReceiver(); public: void insert(uint16_t seq); void remove(uint16_t seq); @@ -159,6 +159,7 @@ class SrsRtpQueue private: uint64_t nn_collected_frames; SrsRtpRingBuffer* queue_; + SrsRtpNackForReceiver* nack_; private: double jitter_; // TODO: FIXME: Covert time to srs_utime_t. @@ -169,8 +170,6 @@ private: uint64_t number_of_packet_lossed_; private: bool one_packet_per_frame_; -public: - SrsRtpNackList nack_; private: std::vector > frames_; bool request_key_frame_; @@ -184,12 +183,14 @@ public: bool get_and_clean_if_needed_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); + void request_keyframe() { request_key_frame_ = true; } public: uint32_t get_extended_highest_sequence(); uint8_t get_fraction_lost(); uint32_t get_cumulative_number_of_packets_lost(); uint32_t get_interarrival_jitter(); public: + void get_nack_seqs(std::vector& seqs); void update_rtt(int rtt); private: void insert_into_nack_list(uint16_t seq_start, uint16_t seq_end); diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 3f543915a..989abbb12 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -52,6 +52,7 @@ using namespace std; #include #ifdef SRS_RTC #include +#include #endif #define CONST_MAX_JITTER_MS 250 @@ -1966,6 +1967,10 @@ SrsSource::SrsSource() _srs_config->subscribe(this); atc = false; + +#ifdef SRS_RTC + rtc_publisher = NULL; +#endif } SrsSource::~SrsSource() @@ -2749,4 +2754,11 @@ SrsMetaCache* SrsSource::cached_meta() { return meta; } + +void SrsSource::request_keyframe() +{ + if (rtc_publisher) { + rtc_publisher->request_keyframe(); + } +} #endif diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index fcc6c84d4..8194b46ff 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -63,6 +63,9 @@ class SrsBuffer; class SrsHds; #endif class SrsRtpSharedPacket; +#ifdef SRS_RTC +class SrsRtcPublisher; +#endif // The time jitter algorithm: // 1. full, to ensure stream start at zero, and ensure stream monotonically increasing. @@ -577,6 +580,10 @@ private: // The last die time, when all consumers quit and no publisher, // We will remove the source when source die. srs_utime_t die_at; +#ifdef SRS_RTC +private: + SrsRtcPublisher* rtc_publisher; +#endif public: SrsSource(); virtual ~SrsSource(); @@ -639,12 +646,17 @@ public: virtual void on_edge_proxy_unpublish(); public: virtual std::string get_curr_origin(); -public: #ifdef SRS_RTC +public: // Find rtp packet by sequence SrsRtpSharedPacket* find_rtp_packet(const uint16_t& seq); // Get the cached meta, as such the sps/pps. SrsMetaCache* cached_meta(); + // Request keyframe for new client. + // TODO: FIXME: Maybe we could cache the keyframe. + // TODO: FIXME: Maybe we should only response for the new clients. + void request_keyframe(); + void set_rtc_publisher(SrsRtcPublisher* v) { rtc_publisher = v; } #endif }; From 583ae52df88bf1050afc251ccfb2840c4b92e665 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 09:33:21 +0800 Subject: [PATCH 26/79] Rename functions for RTC publisher --- trunk/src/app/srs_app_rtc_conn.cpp | 38 ++++++++++++++--------------- trunk/src/app/srs_app_rtc_conn.hpp | 4 +-- trunk/src/app/srs_app_rtp_queue.cpp | 16 ++++++------ trunk/src/app/srs_app_rtp_queue.hpp | 11 +++------ 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 00cd9928b..a3fbc57ae 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1573,18 +1573,18 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) { srs_error_t err = srs_success; - SrsRtpSharedPacket* rtp_shared_pkt = new SrsRtpSharedPacket(); - SrsAutoFree(SrsRtpSharedPacket, rtp_shared_pkt); - if ((err = rtp_shared_pkt->decode(buf, nb_buf)) != srs_success) { + SrsRtpSharedPacket* pkt = new SrsRtpSharedPacket(); + SrsAutoFree(SrsRtpSharedPacket, pkt); + if ((err = pkt->decode(buf, nb_buf)) != srs_success) { return srs_error_wrap(err, "rtp packet decode failed"); } - uint32_t ssrc = rtp_shared_pkt->rtp_header.get_ssrc(); + uint32_t ssrc = pkt->rtp_header.get_ssrc(); if (ssrc == audio_ssrc) { - return on_audio(skt, rtp_shared_pkt); + return on_audio(skt, pkt); } else if (ssrc == video_ssrc) { - return on_video(skt, rtp_shared_pkt); + return on_video(skt, pkt); } return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); @@ -1933,20 +1933,19 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr return err; } -srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; - rtp_pkt->rtp_payload_header = new SrsRtpOpusHeader(); - if ((err = rtp_opus_demuxer->parse(rtp_pkt)) != srs_success) { + pkt->rtp_payload_header = new SrsRtpOpusHeader(); + if ((err = rtp_opus_demuxer->parse(pkt)) != srs_success) { return srs_error_wrap(err, "rtp opus demux failed"); } - // TODO: FIXME: Rename it. // TODO: FIXME: Error check. - rtp_audio_queue->insert(rtp_pkt); + rtp_audio_queue->consume(pkt); - if (rtp_audio_queue->get_and_clean_if_needed_request_key_frame()) { + if (rtp_audio_queue->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(skt, audio_ssrc); } @@ -1961,7 +1960,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() srs_error_t err = srs_success; std::vector > frames; - rtp_audio_queue->get_and_clean_collected_frames(frames); + rtp_audio_queue->collect_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { if (!frames[i].empty()) { @@ -1979,19 +1978,20 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() return err; } -srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt) +srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; - rtp_pkt->rtp_payload_header = new SrsRtpH264Header(); + pkt->rtp_payload_header = new SrsRtpH264Header(); - if ((err = rtp_h264_demuxer->parse(rtp_pkt)) != srs_success) { + if ((err = rtp_h264_demuxer->parse(pkt)) != srs_success) { return srs_error_wrap(err, "rtp h264 demux failed"); } - rtp_video_queue->insert(rtp_pkt); + // TODO: FIXME: Error check. + rtp_video_queue->consume(pkt); - if (rtp_video_queue->get_and_clean_if_needed_request_key_frame()) { + if (rtp_video_queue->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(skt, video_ssrc); } @@ -2006,7 +2006,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() srs_error_t err = srs_success; std::vector > frames; - rtp_video_queue->get_and_clean_collected_frames(frames); + rtp_video_queue->collect_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { if (!frames[i].empty()) { diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 42bbe0f6e..cb7b019fe 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -291,10 +291,10 @@ private: srs_error_t send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc); srs_error_t send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc); private: - srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); + srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); srs_error_t collect_audio_frame(); private: - srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* rtp_pkt); + srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); private: srs_error_t collect_video_frame(); public: diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 3e5d3a8cb..99c1dc6b1 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -269,14 +269,14 @@ SrsRtpQueue::~SrsRtpQueue() srs_freep(nack_); } -srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) +srs_error_t SrsRtpQueue::consume(SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; // TODO: FIXME: Update time for each packet, may hurt performance. srs_utime_t now = srs_update_system_time(); - uint16_t seq = rtp_pkt->rtp_header.get_sequence(); + uint16_t seq = pkt->rtp_header.get_sequence(); SrsRtpNackInfo* nack_info = nack_->find(seq); if (nack_info) { int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; @@ -289,9 +289,9 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) // Calc jitter time, ignore nack packets. // TODO: FIXME: Covert time to srs_utime_t. if (last_trans_time_ == -1) { - last_trans_time_ = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; + last_trans_time_ = now / 1000 - pkt->rtp_header.get_timestamp() / 90; } else if (!nack_info) { - int trans_time = now / 1000 - rtp_pkt->rtp_header.get_timestamp() / 90; + int trans_time = now / 1000 - pkt->rtp_header.get_timestamp() / 90; int cur_jitter = trans_time - last_trans_time_; if (cur_jitter < 0) { @@ -338,25 +338,25 @@ srs_error_t SrsRtpQueue::insert(SrsRtpSharedPacket* rtp_pkt) } // TODO: FIXME: Change to ptr of ptr. - queue_->set(seq, rtp_pkt->copy()); + queue_->set(seq, pkt->copy()); // Collect packets to frame when: // 1. Marker bit means the last packet of frame received. // 2. Queue has lots of packets, the load is heavy. // 3. The frame contains only one packet for each frame. - if (rtp_pkt->rtp_header.get_marker() || queue_->is_heavy() || one_packet_per_frame_) { + if (pkt->rtp_header.get_marker() || queue_->is_heavy() || one_packet_per_frame_) { collect_packet(); } return err; } -void SrsRtpQueue::get_and_clean_collected_frames(std::vector >& frames) +void SrsRtpQueue::collect_frames(std::vector >& frames) { frames.swap(frames_); } -bool SrsRtpQueue::get_and_clean_if_needed_request_key_frame() +bool SrsRtpQueue::should_request_key_frame() { if (request_key_frame_) { request_key_frame_ = false; diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 7483f297b..33c1d3057 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -160,6 +160,7 @@ private: uint64_t nn_collected_frames; SrsRtpRingBuffer* queue_; SrsRtpNackForReceiver* nack_; + bool one_packet_per_frame_; private: double jitter_; // TODO: FIXME: Covert time to srs_utime_t. @@ -168,8 +169,6 @@ private: uint64_t pre_number_of_packet_lossed_; uint64_t num_of_packet_received_; uint64_t number_of_packet_lossed_; -private: - bool one_packet_per_frame_; private: std::vector > frames_; bool request_key_frame_; @@ -177,10 +176,9 @@ public: SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); virtual ~SrsRtpQueue(); public: - srs_error_t insert(SrsRtpSharedPacket* rtp_pkt); -public: - void get_and_clean_collected_frames(std::vector >& frames); - bool get_and_clean_if_needed_request_key_frame(); + srs_error_t consume(SrsRtpSharedPacket* pkt); + void collect_frames(std::vector >& frames); + bool should_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); void request_keyframe() { request_key_frame_ = true; } @@ -194,7 +192,6 @@ public: void update_rtt(int rtt); private: void insert_into_nack_list(uint16_t seq_start, uint16_t seq_end); -private: void collect_packet(); }; From 99f9f566bafc4fd6b060c5229332f41ff36fc58d Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 10:00:07 +0800 Subject: [PATCH 27/79] Refactor RTC function names --- trunk/src/app/srs_app_rtc_conn.cpp | 81 +++++++++++++++--------------- trunk/src/app/srs_app_rtc_conn.hpp | 15 +++--- trunk/src/app/srs_app_source.hpp | 2 + 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index a3fbc57ae..34223e367 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -940,7 +940,7 @@ srs_error_t SrsRtcSenderThread::messages_to_packets( for (int i = 0; i < nn_extra_payloads; i++) { SrsSample* sample = msg->extra_payloads() + i; - if ((err = packet_opus(sample, packets, msg->nn_max_extra_payloads())) != srs_success) { + if ((err = package_opus(sample, packets, msg->nn_max_extra_payloads())) != srs_success) { return srs_error_wrap(err, "opus package"); } } @@ -952,14 +952,14 @@ srs_error_t SrsRtcSenderThread::messages_to_packets( // Well, for each IDR, we append a SPS/PPS before it, which is packaged in STAP-A. if (msg->has_idr()) { - if ((err = packet_stap_a(source, msg, packets)) != srs_success) { + if ((err = package_stap_a(source, msg, packets)) != srs_success) { return srs_error_wrap(err, "packet stap-a"); } } // If merge Nalus, we pcakges all NALUs(samples) as one NALU, in a RTP or FUA packet. if (packets.should_merge_nalus && nn_samples > 1) { - if ((err = packet_nalus(msg, packets)) != srs_success) { + if ((err = package_nalus(msg, packets)) != srs_success) { return srs_error_wrap(err, "packet stap-a"); } continue; @@ -976,11 +976,11 @@ srs_error_t SrsRtcSenderThread::messages_to_packets( } if (sample->size <= kRtpMaxPayloadSize) { - if ((err = packet_single_nalu(msg, sample, packets)) != srs_success) { + if ((err = package_single_nalu(msg, sample, packets)) != srs_success) { return srs_error_wrap(err, "packet single nalu"); } } else { - if ((err = packet_fu_a(msg, sample, kRtpMaxPayloadSize, packets)) != srs_success) { + if ((err = package_fu_a(msg, sample, kRtpMaxPayloadSize, packets)) != srs_success) { return srs_error_wrap(err, "packet fu-a"); } } @@ -1263,7 +1263,7 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) return err; } -srs_error_t SrsRtcSenderThread::packet_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcSenderThread::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1353,7 +1353,7 @@ srs_error_t SrsRtcSenderThread::packet_nalus(SrsSharedPtrMessage* msg, SrsRtcPac return err; } -srs_error_t SrsRtcSenderThread::packet_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload) +srs_error_t SrsRtcSenderThread::package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload) { srs_error_t err = srs_success; @@ -1389,7 +1389,7 @@ srs_error_t SrsRtcSenderThread::packet_opus(SrsSample* sample, SrsRtcPackets& pa return err; } -srs_error_t SrsRtcSenderThread::packet_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets) +srs_error_t SrsRtcSenderThread::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1430,7 +1430,7 @@ srs_error_t SrsRtcSenderThread::packet_fu_a(SrsSharedPtrMessage* msg, SrsSample* } // Single NAL Unit Packet @see https://tools.ietf.org/html/rfc6184#section-5.6 -srs_error_t SrsRtcSenderThread::packet_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets) +srs_error_t SrsRtcSenderThread::package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1450,7 +1450,7 @@ srs_error_t SrsRtcSenderThread::packet_single_nalu(SrsSharedPtrMessage* msg, Srs return err; } -srs_error_t SrsRtcSenderThread::packet_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcSenderThread::package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1569,27 +1569,6 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui return err; } -srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) -{ - srs_error_t err = srs_success; - - SrsRtpSharedPacket* pkt = new SrsRtpSharedPacket(); - SrsAutoFree(SrsRtpSharedPacket, pkt); - if ((err = pkt->decode(buf, nb_buf)) != srs_success) { - return srs_error_wrap(err, "rtp packet decode failed"); - } - - uint32_t ssrc = pkt->rtp_header.get_ssrc(); - - if (ssrc == audio_ssrc) { - return on_audio(skt, pkt); - } else if (ssrc == video_ssrc) { - return on_video(skt, pkt); - } - - return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); -} - srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) { srs_error_t err = srs_success; @@ -1933,6 +1912,27 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr return err; } +srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) +{ + srs_error_t err = srs_success; + + SrsRtpSharedPacket* pkt = new SrsRtpSharedPacket(); + SrsAutoFree(SrsRtpSharedPacket, pkt); + if ((err = pkt->decode(buf, nb_buf)) != srs_success) { + return srs_error_wrap(err, "rtp packet decode failed"); + } + + uint32_t ssrc = pkt->rtp_header.get_ssrc(); + + if (ssrc == audio_ssrc) { + return on_audio(skt, pkt); + } else if (ssrc == video_ssrc) { + return on_video(skt, pkt); + } + + return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); +} + srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; @@ -1959,19 +1959,18 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() { srs_error_t err = srs_success; - std::vector > frames; - rtp_audio_queue->collect_frames(frames); + std::vector > framess; + rtp_audio_queue->collect_frames(framess); - for (size_t i = 0; i < frames.size(); ++i) { - if (!frames[i].empty()) { - srs_verbose("collect %d audio frames, seq range %u,%u", - frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); - } + for (size_t i = 0; i < framess.size(); ++i) { + vector frames = framess[i]; - // TODO: FIXME: Write audio frame to source. + for (size_t j = 0; j < frames.size(); ++j) { + SrsRtpSharedPacket* pkt = frames[j]; + + // TODO: FIXME: Write audio frame to source. - for (size_t n = 0; n < frames[i].size(); ++n) { - srs_freep(frames[i][n]); + srs_freep(pkt); } } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index cb7b019fe..b4eb22cfb 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -246,12 +246,12 @@ private: srs_error_t send_packets(SrsRtcPackets& packets); srs_error_t send_packets_gso(SrsRtcPackets& packets); private: - srs_error_t packet_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload); + srs_error_t package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload); private: - srs_error_t packet_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets); - srs_error_t packet_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets); - srs_error_t packet_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets); - srs_error_t packet_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); + srs_error_t package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets); + srs_error_t package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets); + srs_error_t package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets); + srs_error_t package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); }; class SrsRtcPublisher : virtual public ISrsHourGlass @@ -282,7 +282,6 @@ public: virtual ~SrsRtcPublisher(); public: srs_error_t initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest* req); - srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); private: @@ -290,12 +289,12 @@ private: srs_error_t send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue); srs_error_t send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc); srs_error_t send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc); +public: + srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); private: srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); srs_error_t collect_audio_frame(); -private: srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); -private: srs_error_t collect_video_frame(); public: void update_sendonly_socket(SrsUdpMuxSocket* skt); diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 8194b46ff..278fcf15e 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -657,6 +657,8 @@ public: // TODO: FIXME: Maybe we should only response for the new clients. void request_keyframe(); void set_rtc_publisher(SrsRtcPublisher* v) { rtc_publisher = v; } + // When got RTC audio message, which is encoded in opus. + srs_error_t on_rtc_audio(SrsSharedPtrMessage* audio); #endif }; From 5ee5ef6ab2a81e805e293815a657cb74fa46b569 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 10:57:03 +0800 Subject: [PATCH 28/79] For #307, support publish RTC with passing opus. 4.0.24 --- README.md | 1 + trunk/src/app/srs_app_rtc_conn.cpp | 29 +++++++++++++++++++++++---- trunk/src/app/srs_app_source.cpp | 11 +++++++++- trunk/src/app/srs_app_source.hpp | 3 +++ trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/kernel/srs_kernel_codec.cpp | 2 +- trunk/src/kernel/srs_kernel_flv.hpp | 2 ++ 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6f3e07ae3..1c490f621 100755 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ For previous versions, please read: ## V4 changes +* v4.0, 2020-04-30, For [#307][bug #307], support publish RTC with passing opus. 4.0.24 * v4.0, 2020-04-14, For [#307][bug #307], support sendmmsg, GSO and reuseport. 4.0.23 * v4.0, 2020-04-05, For [#307][bug #307], SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22 * v4.0, 2020-04-04, Merge RTC and GB28181, with bugs fixed. 4.0.21 diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 34223e367..5c1458d9d 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -769,6 +769,7 @@ srs_error_t SrsRtcSenderThread::cycle() SrsConsumer* consumer = NULL; SrsAutoFree(SrsConsumer, consumer); + // TODO: FIXME: Dumps the SPS/PPS from gop cache, without other frames. if ((err = source->create_consumer(NULL, consumer)) != srs_success) { return srs_error_wrap(err, "rtc create consumer, source url=%s", req->get_stream_url().c_str()); } @@ -1967,8 +1968,26 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() for (size_t j = 0; j < frames.size(); ++j) { SrsRtpSharedPacket* pkt = frames[j]; - - // TODO: FIXME: Write audio frame to source. + + if (pkt->rtp_payload_size() > 0) { + SrsMessageHeader header; + header.message_type = RTMP_MSG_AudioMessage; + // TODO: FIXME: Maybe the tbn is not 90k. + header.timestamp = pkt->rtp_header.get_timestamp() / 90; + + SrsSharedPtrMessage msg; + // TODO: FIXME: Check error. + msg.create(&header, NULL, 0); + + SrsSample sample; + sample.size = pkt->rtp_payload_size(); + sample.bytes = new char[sample.size]; + memcpy((void*)sample.bytes, pkt->rtp_payload(), sample.size); + msg.set_extra_payloads(&sample, 1); + + // TODO: FIXME: Check error. + source->on_rtc_audio(&msg); + } srs_freep(pkt); } @@ -2103,11 +2122,12 @@ srs_error_t SrsRtcPublisher::collect_video_frame() stream->write_string(pps); SrsMessageHeader header; - header.message_type = 9; + header.message_type = RTMP_MSG_VideoMessage; // TODO: FIXME: Maybe the tbn is not 90k. header.timestamp = timestamp / 90; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); + // TODO: FIXME: Check error. shared_video->create(&header, reinterpret_cast(video_header), stream->pos()); srs_error_t e = source->on_video(shared_video); if (e != srs_success) { @@ -2130,11 +2150,12 @@ srs_error_t SrsRtcPublisher::collect_video_frame() frame_buffer[4] = 0x00; SrsMessageHeader header; - header.message_type = 9; + header.message_type = RTMP_MSG_VideoMessage; // TODO: FIXME: Maybe the tbn is not 90k. header.timestamp = timestamp / 90; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); + // TODO: FIXME: Check error. shared_video->create(&header, reinterpret_cast(frame_buffer), frame_buffer_index); srs_error_t e = source->on_video(shared_video); if (e != srs_success) { diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 989abbb12..d87c65f97 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1030,7 +1030,8 @@ srs_error_t SrsOriginHub::on_audio(SrsSharedPtrMessage* shared_audio) srs_error_t err = srs_success; SrsSharedPtrMessage* msg = shared_audio; - + + // TODO: FIXME: Support parsing OPUS for RTC. if ((err = format->on_audio(msg)) != srs_success) { return srs_error_wrap(err, "format consume audio"); } @@ -1058,6 +1059,7 @@ srs_error_t SrsOriginHub::on_audio(SrsSharedPtrMessage* shared_audio) } #ifdef SRS_RTC + // TODO: FIXME: Support parsing OPUS for RTC. if ((err = rtc->on_audio(msg, format)) != srs_success) { srs_warn("rtc: ignore audio error %s", srs_error_desc(err).c_str()); srs_error_reset(err); @@ -2761,4 +2763,11 @@ void SrsSource::request_keyframe() rtc_publisher->request_keyframe(); } } + +srs_error_t SrsSource::on_rtc_audio(SrsSharedPtrMessage* audio) +{ + // TODO: FIXME: Merge with on_audio. + // TODO: FIXME: Print key information. + return on_audio_imp(audio); +} #endif diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 278fcf15e..ac2bad45c 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -613,10 +613,12 @@ public: virtual bool can_publish(bool is_edge); virtual srs_error_t on_meta_data(SrsCommonMessage* msg, SrsOnMetaDataPacket* metadata); public: + // TODO: FIXME: Use SrsSharedPtrMessage instead. virtual srs_error_t on_audio(SrsCommonMessage* audio); private: virtual srs_error_t on_audio_imp(SrsSharedPtrMessage* audio); public: + // TODO: FIXME: Use SrsSharedPtrMessage instead. virtual srs_error_t on_video(SrsCommonMessage* video); private: virtual srs_error_t on_video_imp(SrsSharedPtrMessage* video); @@ -658,6 +660,7 @@ public: void request_keyframe(); void set_rtc_publisher(SrsRtcPublisher* v) { rtc_publisher = v; } // When got RTC audio message, which is encoded in opus. + // TODO: FIXME: Merge with on_audio. srs_error_t on_rtc_audio(SrsSharedPtrMessage* audio); #endif }; diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index e47dfdc68..abaee8484 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 23 +#define SRS_VERSION4_REVISION 24 #endif diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index e0789c236..26a3ffdde 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -603,7 +603,7 @@ srs_error_t SrsFormat::on_audio(int64_t timestamp, char* data, int size) srs_error_t err = srs_success; if (!data || size <= 0) { - srs_trace("no audio present, ignore it."); + srs_info("no audio present, ignore it."); return err; } diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index f92ad6655..80d3ce542 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -158,6 +158,7 @@ public: // 1byte. // One byte field to represent the message type. A range of type IDs // (1-7) are reserved for protocol control messages. + // For example, RTMP_MSG_AudioMessage or RTMP_MSG_VideoMessage. int8_t message_type; // 4bytes. // Four-byte field that identifies the stream of the message. These @@ -245,6 +246,7 @@ public: // 1byte. // One byte field to represent the message type. A range of type IDs // (1-7) are reserved for protocol control messages. + // For example, RTMP_MSG_AudioMessage or RTMP_MSG_VideoMessage. int8_t message_type; // Get the perfered cid(chunk stream id) which sendout over. // set at decoding, and canbe used for directly send message, From fdcff3e6c2ff61496bf68049ca1f796237b6a5cc Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 14:49:37 +0800 Subject: [PATCH 29/79] Refactor code, remove skt in param --- trunk/src/app/srs_app_listener.cpp | 4 + trunk/src/app/srs_app_rtc_conn.cpp | 408 +++++++++++++---------------- trunk/src/app/srs_app_rtc_conn.hpp | 92 +++---- 3 files changed, 231 insertions(+), 273 deletions(-) diff --git a/trunk/src/app/srs_app_listener.cpp b/trunk/src/app/srs_app_listener.cpp index 3294c79f5..72d62fffe 100755 --- a/trunk/src/app/srs_app_listener.cpp +++ b/trunk/src/app/srs_app_listener.cpp @@ -460,6 +460,10 @@ srs_error_t SrsUdpMuxListener::cycle() nn_loop++; + // TODO: FIXME: Refactor the memory cache for receiver. + // Because we have to decrypt the cipher of received packet payload, + // and the size is not determined, so we think there is at least one copy, + // and we can reuse the plaintext h264/opus with players when got plaintext. SrsUdpMuxSocket skt(sender, lfd); int nread = skt.recvfrom(SRS_UTIME_NO_TIMEOUT); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 5c1458d9d..c2fbba7c6 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -70,17 +70,17 @@ using namespace std; // which reserves 100 bytes for SRTP or paddings. const int kRtpMaxPayloadSize = kRtpPacketSize - 200; -static bool is_stun(const uint8_t* data, const int size) +static bool is_stun(const uint8_t* data, const int size) { return data != NULL && size > 0 && (data[0] == 0 || data[0] == 1); } -static bool is_dtls(const uint8_t* data, size_t len) +static bool is_dtls(const uint8_t* data, size_t len) { return (len >= 13 && (data[0] > 19 && data[0] < 64)); } -static bool is_rtp_or_rtcp(const uint8_t* data, size_t len) +static bool is_rtp_or_rtcp(const uint8_t* data, size_t len) { return (len >= 12 && (data[0] & 0xC0) == 0x80); } @@ -260,7 +260,7 @@ srs_error_t SrsDtlsSession::initialize(SrsRequest* r) return err; } -srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) +srs_error_t SrsDtlsSession::handshake() { srs_error_t err = srs_success; @@ -272,7 +272,7 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) int ssl_err = SSL_get_error(dtls, ret); switch(ssl_err) { case SSL_ERROR_NONE: { - if ((err = on_dtls_handshake_done(skt)) != srs_success) { + if ((err = on_dtls_handshake_done()) != srs_success) { return srs_error_wrap(err, "dtls handshake done handle"); } break; @@ -292,7 +292,7 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) } if (out_bio_len) { - if ((err = skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { + if ((err = rtc_session->sendonly_skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { return srs_error_wrap(err, "send dtls packet"); } } @@ -306,7 +306,7 @@ srs_error_t SrsDtlsSession::handshake(SrsUdpMuxSocket* skt) return err; } -srs_error_t SrsDtlsSession::on_dtls(SrsUdpMuxSocket* skt) +srs_error_t SrsDtlsSession::on_dtls(char* data, int nb_data) { srs_error_t err = srs_success; if (BIO_reset(bio_in) != 1) { @@ -316,19 +316,19 @@ srs_error_t SrsDtlsSession::on_dtls(SrsUdpMuxSocket* skt) return srs_error_new(ERROR_OpenSslBIOReset, "BIO_reset"); } - if (BIO_write(bio_in, skt->data(), skt->size()) <= 0) { + if (BIO_write(bio_in, data, nb_data) <= 0) { // TODO: 0 or -1 maybe block, use BIO_should_retry to check. return srs_error_new(ERROR_OpenSslBIOWrite, "BIO_write"); } if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { // Ignore any error for black-hole. - void* p = skt->data(); int len = skt->size(); SrsRtcSession* s = rtc_session; + void* p = data; int len = nb_data; SrsRtcSession* s = rtc_session; srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } if (!handshake_done) { - err = handshake(skt); + err = handshake(); } else { while (BIO_ctrl_pending(bio_in) > 0) { char dtls_read_buf[8092]; @@ -345,7 +345,7 @@ srs_error_t SrsDtlsSession::on_dtls(SrsUdpMuxSocket* skt) return err; } -srs_error_t SrsDtlsSession::on_dtls_handshake_done(SrsUdpMuxSocket* skt) +srs_error_t SrsDtlsSession::on_dtls_handshake_done() { srs_error_t err = srs_success; srs_trace("rtc session=%s, DTLS handshake done.", rtc_session->id().c_str()); @@ -355,7 +355,7 @@ srs_error_t SrsDtlsSession::on_dtls_handshake_done(SrsUdpMuxSocket* skt) return srs_error_wrap(err, "srtp init failed"); } - return rtc_session->on_connection_established(skt); + return rtc_session->on_connection_established(); } srs_error_t SrsDtlsSession::on_dtls_application_data(const char* buf, const int nb_buf) @@ -367,7 +367,7 @@ srs_error_t SrsDtlsSession::on_dtls_application_data(const char* buf, const int return err; } -srs_error_t SrsDtlsSession::srtp_initialize() +srs_error_t SrsDtlsSession::srtp_initialize() { srs_error_t err = srs_success; @@ -375,7 +375,7 @@ srs_error_t SrsDtlsSession::srtp_initialize() static const string dtls_srtp_lable = "EXTRACTOR-dtls_srtp"; if (!SSL_export_keying_material(dtls, material, sizeof(material), dtls_srtp_lable.c_str(), dtls_srtp_lable.size(), NULL, 0, 0)) { return srs_error_new(ERROR_RTC_SRTP_INIT, "SSL_export_keying_material failed"); - } + } size_t offset = 0; @@ -415,7 +415,7 @@ srs_error_t SrsDtlsSession::srtp_send_init() srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy.rtcp); policy.ssrc.type = ssrc_any_outbound; - + policy.ssrc.value = 0; // TODO: adjust window_size policy.window_size = 8192; @@ -629,15 +629,13 @@ SrsRtpPacket2* SrsRtcPackets::at(int index) return cache + index; } -SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, SrsUdpMuxSocket* u, int parent_cid) - : sendonly_ukt(NULL) +SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, int parent_cid) { _parent_cid = parent_cid; trd = new SrsDummyCoroutine(); rtc_session = s; - sendonly_ukt = u->copy_sendonly(); - sender = u->sender(); + sender = NULL; gso = false; merge_nalus = false; @@ -660,7 +658,6 @@ SrsRtcSenderThread::~SrsRtcSenderThread() _srs_config->unsubscribe(this); srs_freep(trd); - srs_freep(sendonly_ukt); } srs_error_t SrsRtcSenderThread::initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt) @@ -723,14 +720,14 @@ int SrsRtcSenderThread::cid() srs_error_t SrsRtcSenderThread::start() { srs_error_t err = srs_success; - + srs_freep(trd); trd = new SrsSTCoroutine("rtc_sender", this, _parent_cid); - + if ((err = trd->start()) != srs_success) { return srs_error_wrap(err, "rtc_sender"); } - + return err; } @@ -744,16 +741,6 @@ void SrsRtcSenderThread::stop_loop() trd->interrupt(); } -void SrsRtcSenderThread::update_sendonly_socket(SrsUdpMuxSocket* skt) -{ - srs_trace("session %s address changed, update %s -> %s", - rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), skt->get_peer_id().c_str()); - - srs_freep(sendonly_ukt); - sendonly_ukt = skt->copy_sendonly(); - sender = skt->sender(); -} - srs_error_t SrsRtcSenderThread::cycle() { srs_error_t err = srs_success; @@ -1043,8 +1030,8 @@ srs_error_t SrsRtcSenderThread::send_packets(SrsRtcPackets& packets) packets.nn_rtp_bytes += (int)iov->iov_len; // Set the address and control information. - sockaddr_in* addr = (sockaddr_in*)sendonly_ukt->peer_addr(); - socklen_t addrlen = (socklen_t)sendonly_ukt->peer_addrlen(); + sockaddr_in* addr = (sockaddr_in*)rtc_session->sendonly_skt->peer_addr(); + socklen_t addrlen = (socklen_t)rtc_session->sendonly_skt->peer_addrlen(); mhdr->msg_hdr.msg_name = (sockaddr_in*)addr; mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen; @@ -1220,8 +1207,8 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) if (do_send) { // Set the address and control information. - sockaddr_in* addr = (sockaddr_in*)sendonly_ukt->peer_addr(); - socklen_t addrlen = (socklen_t)sendonly_ukt->peer_addrlen(); + sockaddr_in* addr = (sockaddr_in*)rtc_session->sendonly_skt->peer_addr(); + socklen_t addrlen = (socklen_t)rtc_session->sendonly_skt->peer_addrlen(); mhdr->msg_hdr.msg_name = (sockaddr_in*)addr; mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen; @@ -1506,8 +1493,6 @@ srs_error_t SrsRtcSenderThread::package_stap_a(SrsSource* source, SrsSharedPtrMe SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) { - sendonly_ukt = NULL; - report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); rtc_session = session; @@ -1535,12 +1520,10 @@ SrsRtcPublisher::~SrsRtcPublisher() srs_freep(rtp_audio_queue); } -srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest* r) +srs_error_t SrsRtcPublisher::initialize(uint32_t vssrc, uint32_t assrc, SrsRequest* r) { srs_error_t err = srs_success; - sendonly_ukt = skt; - video_ssrc = vssrc; audio_ssrc = assrc; req = r; @@ -1570,7 +1553,7 @@ srs_error_t SrsRtcPublisher::initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, ui return err; } -srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcPublisher::on_rtcp_sender_report(char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -1661,7 +1644,7 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ return err; } -srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf) { srs_error_t err = srs_success; /* @@ -1724,7 +1707,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* return err; } -void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt) +void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc) { // If DTLS is not OK, drop all messages. if (!rtc_session->dtls_session) { @@ -1759,14 +1742,14 @@ void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, Sr // FIXME: Merge nack rtcp into one packets. if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { // TODO: FIXME: Check error. - skt->sendto(protected_buf, nb_protected_buf, 0); + rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); } ++iter; } } -srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue) +srs_error_t SrsRtcPublisher::send_rtcp_rr(uint32_t ssrc, SrsRtpQueue* rtp_queue) { srs_error_t err = srs_success; @@ -1781,12 +1764,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S stream.write_1bytes(kRR); stream.write_2bytes(7); stream.write_4bytes(ssrc); - + uint8_t fraction_lost = rtp_queue->get_fraction_lost(); uint32_t cumulative_number_of_packets_lost = rtp_queue->get_cumulative_number_of_packets_lost() & 0x7FFFFF; uint32_t extended_highest_sequence = rtp_queue->get_extended_highest_sequence(); uint32_t interarrival_jitter = rtp_queue->get_interarrival_jitter(); - + uint32_t rr_lsr = 0; uint32_t rr_dlsr = 0; @@ -1798,7 +1781,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S uint32_t dlsr = (srs_update_system_time() - lsr_systime) / 1000; rr_dlsr = ((dlsr / 1000) << 16) | ((dlsr % 1000) * 65536 / 1000); } - + stream.write_4bytes(ssrc); stream.write_1bytes(fraction_lost); stream.write_3bytes(cumulative_number_of_packets_lost); @@ -1806,10 +1789,10 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S stream.write_4bytes(interarrival_jitter); stream.write_4bytes(rr_lsr); stream.write_4bytes(rr_dlsr); - + srs_verbose("RR ssrc=%u, fraction_lost=%u, cumulative_number_of_packets_lost=%u, extended_highest_sequence=%u, interarrival_jitter=%u", ssrc, fraction_lost, cumulative_number_of_packets_lost, extended_highest_sequence, interarrival_jitter); - + char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { @@ -1817,11 +1800,11 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, S } // TDOO: FIXME: Check error. - skt->sendto(protected_buf, nb_protected_buf, 0); + rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } -srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc) +srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(uint32_t ssrc) { srs_error_t err = srs_success; @@ -1877,12 +1860,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ss } // TDOO: FIXME: Check error. - skt->sendto(protected_buf, nb_protected_buf, 0); + rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } -srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc) +srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(uint32_t ssrc) { srs_error_t err = srs_success; @@ -1898,9 +1881,9 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr stream.write_2bytes(2); stream.write_4bytes(ssrc); stream.write_4bytes(ssrc); - + srs_trace("RTC PLI ssrc=%u", ssrc); - + char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { @@ -1908,12 +1891,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssr } // TDOO: FIXME: Check error. - skt->sendto(protected_buf, nb_protected_buf, 0); + rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } -srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) +srs_error_t SrsRtcPublisher::on_rtp(char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -1926,15 +1909,15 @@ srs_error_t SrsRtcPublisher::on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf) uint32_t ssrc = pkt->rtp_header.get_ssrc(); if (ssrc == audio_ssrc) { - return on_audio(skt, pkt); + return on_audio(pkt); } else if (ssrc == video_ssrc) { - return on_video(skt, pkt); + return on_video(pkt); } return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); } -srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt) +srs_error_t SrsRtcPublisher::on_audio(SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; @@ -1948,10 +1931,10 @@ srs_error_t SrsRtcPublisher::on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* if (rtp_audio_queue->should_request_key_frame()) { // TODO: FIXME: Check error. - send_rtcp_fb_pli(skt, audio_ssrc); + send_rtcp_fb_pli(audio_ssrc); } - check_send_nacks(rtp_audio_queue, audio_ssrc, skt); + check_send_nacks(rtp_audio_queue, audio_ssrc); return collect_audio_frame(); } @@ -1969,6 +1952,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() for (size_t j = 0; j < frames.size(); ++j) { SrsRtpSharedPacket* pkt = frames[j]; + // TODO: FIXME: Transcode OPUS to AAC. if (pkt->rtp_payload_size() > 0) { SrsMessageHeader header; header.message_type = RTMP_MSG_AudioMessage; @@ -1996,7 +1980,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() return err; } -srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt) +srs_error_t SrsRtcPublisher::on_video(SrsRtpSharedPacket* pkt) { srs_error_t err = srs_success; @@ -2011,10 +1995,10 @@ srs_error_t SrsRtcPublisher::on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* if (rtp_video_queue->should_request_key_frame()) { // TODO: FIXME: Check error. - send_rtcp_fb_pli(skt, video_ssrc); + send_rtcp_fb_pli(video_ssrc); } - check_send_nacks(rtp_video_queue, video_ssrc, skt); + check_send_nacks(rtp_video_queue, video_ssrc); return collect_video_frame(); } @@ -2028,8 +2012,8 @@ srs_error_t SrsRtcPublisher::collect_video_frame() for (size_t i = 0; i < frames.size(); ++i) { if (!frames[i].empty()) { - srs_verbose("collect %d video frames, seq range %u,%u", - frames.size(), frames[i].front()->rtp_header.get_sequence(), + srs_verbose("collect %d video frames, seq range %u,%u", + frames.size(), frames[i].front()->rtp_header.get_sequence(), frames[i].back()->rtp_header.get_sequence()); } @@ -2085,7 +2069,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame() idr = true; } } - memcpy(frame_buffer + frame_buffer_index, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, + memcpy(frame_buffer + frame_buffer_index, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, rtp_h264_header->nalu_offset[j].second); frame_buffer_index += rtp_h264_header->nalu_offset[j].second; } @@ -2167,15 +2151,6 @@ srs_error_t SrsRtcPublisher::collect_video_frame() return err; } -void SrsRtcPublisher::update_sendonly_socket(SrsUdpMuxSocket* skt) -{ - srs_trace("session %s address changed, update %s -> %s", - rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), skt->get_peer_id().c_str()); - - srs_freep(sendonly_ukt); - sendonly_ukt = skt->copy_sendonly(); -} - void SrsRtcPublisher::request_keyframe() { int scid = _srs_context->get_id(); @@ -2187,15 +2162,15 @@ void SrsRtcPublisher::request_keyframe() srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) { - if (sendonly_ukt) { - // TODO: FIXME: Check error. - send_rtcp_rr(sendonly_ukt, video_ssrc, rtp_video_queue); - send_rtcp_rr(sendonly_ukt, audio_ssrc, rtp_audio_queue); - send_rtcp_xr_rrtr(sendonly_ukt, video_ssrc); - send_rtcp_xr_rrtr(sendonly_ukt, audio_ssrc); - } + srs_error_t err = srs_success; - return srs_success; + // TODO: FIXME: Check error. + send_rtcp_rr(video_ssrc, rtp_video_queue); + send_rtcp_rr(audio_ssrc, rtp_audio_queue); + send_rtcp_xr_rrtr(video_ssrc); + send_rtcp_xr_rrtr(audio_ssrc); + + return err; } SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id) @@ -2208,6 +2183,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& source = NULL; publisher = NULL; sender = NULL; + sendonly_skt = NULL; rtc_server = s; dtls_session = new SrsDtlsSession(this); @@ -2228,6 +2204,7 @@ SrsRtcSession::~SrsRtcSession() srs_freep(req); srs_close_stfd(blackhole_stfd); srs_freep(blackhole_addr); + srs_freep(sendonly_skt); } void SrsRtcSession::set_local_sdp(const SrsSdp& sdp) @@ -2279,32 +2256,31 @@ srs_error_t SrsRtcSession::initialize() return err; } -srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req) +srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r) { srs_error_t err = srs_success; - if (stun_req->is_binding_request()) { - if ((err = on_binding_request(skt, stun_req)) != srs_success) { - return srs_error_wrap(err, "stun binding request failed"); - } + if (!r->is_binding_request()) { + return err; + } - last_stun_time = srs_get_system_time(); + last_stun_time = srs_get_system_time(); - if (sender && sender->sendonly_ukt) { - // We are running in the ice-lite(server) mode. If client have multi network interface, - // we only choose one candidate pair which is determined by client. - if (stun_req->get_use_candidate() && sender->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { - sender->update_sendonly_socket(skt); - } - } + // We are running in the ice-lite(server) mode. If client have multi network interface, + // we only choose one candidate pair which is determined by client. + if (!sendonly_skt || sendonly_skt->get_peer_id() != skt->get_peer_id()) { + update_sendonly_socket(skt); + } - if (publisher && publisher->sendonly_ukt) { - // We are running in the ice-lite(server) mode. If client have multi network interface, - // we only choose one candidate pair which is determined by client. - if (stun_req->get_use_candidate() && publisher->sendonly_ukt->get_peer_id() != skt->get_peer_id()) { - publisher->update_sendonly_socket(skt); - } - } + // Write STUN messages to blackhole. + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = skt->data(); int len = skt->size(); + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + + if ((err = on_binding_request(r)) != srs_success) { + return srs_error_wrap(err, "stun binding request failed"); } return err; @@ -2317,12 +2293,12 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req #define be32toh ntohl #endif -srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req) +srs_error_t SrsRtcSession::on_binding_request(SrsStunPacket* r) { srs_error_t err = srs_success; bool strict_check = _srs_config->get_rtc_stun_strict_check(req->vhost); - if (strict_check && stun_req->get_ice_controlled()) { + if (strict_check && r->get_ice_controlled()) { // @see: https://tools.ietf.org/html/draft-ietf-ice-rfc5245bis-00#section-6.1.3.1 // TODO: Send 487 (Role Conflict) error response. return srs_error_new(ERROR_RTC_STUN, "Peer must not in ice-controlled role in ice-lite mode."); @@ -2334,38 +2310,31 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke SrsAutoFree(SrsBuffer, stream); stun_binding_response.set_message_type(BindingResponse); - stun_binding_response.set_local_ufrag(stun_req->get_remote_ufrag()); - stun_binding_response.set_remote_ufrag(stun_req->get_local_ufrag()); - stun_binding_response.set_transcation_id(stun_req->get_transcation_id()); + stun_binding_response.set_local_ufrag(r->get_remote_ufrag()); + stun_binding_response.set_remote_ufrag(r->get_local_ufrag()); + stun_binding_response.set_transcation_id(r->get_transcation_id()); // FIXME: inet_addr is deprecated, IPV6 support - stun_binding_response.set_mapped_address(be32toh(inet_addr(skt->get_peer_ip().c_str()))); - stun_binding_response.set_mapped_port(skt->get_peer_port()); + stun_binding_response.set_mapped_address(be32toh(inet_addr(sendonly_skt->get_peer_ip().c_str()))); + stun_binding_response.set_mapped_port(sendonly_skt->get_peer_port()); if ((err = stun_binding_response.encode(get_local_sdp()->get_ice_pwd(), stream)) != srs_success) { return srs_error_wrap(err, "stun binding response encode failed"); } - if ((err = skt->sendto(stream->data(), stream->pos(), 0)) != srs_success) { + if ((err = sendonly_skt->sendto(stream->data(), stream->pos(), 0)) != srs_success) { return srs_error_wrap(err, "stun binding response send failed"); } if (get_session_state() == WAITING_STUN) { set_session_state(DOING_DTLS_HANDSHAKE); - peer_id = skt->get_peer_id(); + peer_id = sendonly_skt->get_peer_id(); rtc_server->insert_into_id_sessions(peer_id, this); set_session_state(DOING_DTLS_HANDSHAKE); srs_trace("rtc session=%s, STUN done, waitting DTLS handshake.", id().c_str()); } - // Write STUN messages to blackhole. - if (blackhole && blackhole_addr && blackhole_stfd) { - // Ignore any error for black-hole. - void* p = skt->data(); int len = skt->size(); - srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); - } - if (blackhole && blackhole_addr && blackhole_stfd) { // Ignore any error for black-hole. void* p = stream->data(); int len = stream->pos(); @@ -2375,7 +2344,7 @@ srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacke return err; } -srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -2457,14 +2426,14 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSock // TODO: FIXME: Check error. dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); - skt->sendto(protected_buf, nb_protected_buf, 0); + sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); } } return err; } -srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -2511,25 +2480,25 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxS return err; } -srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf) { if (publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return publisher->on_rtcp_xr(buf, nb_buf, skt); + return publisher->on_rtcp_xr(buf, nb_buf); } -srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf) { if (publisher == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return publisher->on_rtcp_sender_report(buf, nb_buf, skt); + return publisher->on_rtcp_sender_report(buf, nb_buf); } -srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf) { srs_error_t err = srs_success; @@ -2598,7 +2567,7 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ return err; } -srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_connection_established() { srs_error_t err = srs_success; @@ -2606,14 +2575,14 @@ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) if (!local_sdp.media_descs_.empty() && (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { - if ((err = start_publish(skt)) != srs_success) { + if ((err = start_publish()) != srs_success) { return srs_error_wrap(err, "start publish"); } } if (!local_sdp.media_descs_.empty() && (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { - if ((err = start_play(skt)) != srs_success) { + if ((err = start_play()) != srs_success) { return srs_error_wrap(err, "start play"); } } @@ -2621,12 +2590,13 @@ srs_error_t SrsRtcSession::on_connection_established(SrsUdpMuxSocket* skt) return err; } -srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::start_play() { srs_error_t err = srs_success; srs_freep(sender); - sender = new SrsRtcSenderThread(this, skt, _srs_context->get_id()); + sender = new SrsRtcSenderThread(this, _srs_context->get_id()); + sender->update_sender(sendonly_skt->sender()); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2654,7 +2624,7 @@ srs_error_t SrsRtcSession::start_play(SrsUdpMuxSocket* skt) return err; } -srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::start_publish() { srs_error_t err = srs_success; @@ -2677,7 +2647,7 @@ srs_error_t SrsRtcSession::start_publish(SrsUdpMuxSocket* skt) } // FIXME: err process. - if ((err = publisher->initialize(skt, video_ssrc, audio_ssrc, req)) != srs_success) { + if ((err = publisher->initialize(video_ssrc, audio_ssrc, req)) != srs_success) { return srs_error_wrap(err, "rtc publisher init"); } @@ -2689,12 +2659,12 @@ bool SrsRtcSession::is_stun_timeout() return last_stun_time + sessionStunTimeout < srs_get_system_time(); } -srs_error_t SrsRtcSession::on_dtls(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_dtls(char* data, int nb_data) { - return dtls_session->on_dtls(skt); + return dtls_session->on_dtls(data, nb_data); } -srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtcp(char* data, int nb_data) { srs_error_t err = srs_success; @@ -2703,8 +2673,8 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) } char unprotected_buf[kRtpPacketSize]; - int nb_unprotected_buf = skt->size(); - if ((err = dtls_session->unprotect_rtcp(unprotected_buf, skt->data(), nb_unprotected_buf)) != srs_success) { + int nb_unprotected_buf = nb_data; + if ((err = dtls_session->unprotect_rtcp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { return srs_error_wrap(err, "rtcp unprotect failed"); } @@ -2730,11 +2700,11 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) switch (payload_type) { case kSR: { - err = on_rtcp_sender_report(ph, length, skt); + err = on_rtcp_sender_report(ph, length); break; } case kRR: { - err = on_rtcp_receiver_report(ph, length, skt); + err = on_rtcp_receiver_report(ph, length); break; } case kSDES: { @@ -2747,15 +2717,15 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) break; } case kRtpFb: { - err = on_rtcp_feedback(ph, length, skt); + err = on_rtcp_feedback(ph, length); break; } case kPsFb: { - err = on_rtcp_ps_feedback(ph, length, skt); + err = on_rtcp_ps_feedback(ph, length); break; } case kXR: { - err = on_rtcp_xr(ph, length, skt); + err = on_rtcp_xr(ph, length); break; } default:{ @@ -2775,7 +2745,7 @@ srs_error_t SrsRtcSession::on_rtcp(SrsUdpMuxSocket* skt) return err; } -srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) +srs_error_t SrsRtcSession::on_rtp(char* data, int nb_data) { srs_error_t err = srs_success; @@ -2788,8 +2758,8 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) } char* unprotected_buf = new char[kRtpPacketSize]; - int nb_unprotected_buf = skt->size(); - if ((err = dtls_session->unprotect_rtp(unprotected_buf, skt->data(), nb_unprotected_buf)) != srs_success) { + int nb_unprotected_buf = nb_data; + if ((err = dtls_session->unprotect_rtp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { return srs_error_wrap(err, "rtp unprotect failed"); } @@ -2799,7 +2769,21 @@ srs_error_t SrsRtcSession::on_rtp(SrsUdpMuxSocket* skt) srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } - return publisher->on_rtp(skt, unprotected_buf, nb_unprotected_buf); + return publisher->on_rtp(unprotected_buf, nb_unprotected_buf); +} + +void SrsRtcSession::update_sendonly_socket(SrsUdpMuxSocket* skt) +{ + if (sendonly_skt) { + srs_trace("session %s address changed, update %s -> %s", + id().c_str(), sendonly_skt->get_peer_id().c_str(), skt->get_peer_id().c_str()); + } + + srs_freep(sendonly_skt); + sendonly_skt = skt->copy_sendonly(); + if (sender) { + sender->update_sender(skt->sender()); + } } SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) @@ -3166,13 +3150,54 @@ srs_error_t SrsRtcServer::listen_udp() srs_error_t SrsRtcServer::on_udp_packet(SrsUdpMuxSocket* skt) { - if (is_stun(reinterpret_cast(skt->data()), skt->size())) { - return on_stun(skt); - } else if (is_dtls(reinterpret_cast(skt->data()), skt->size())) { - return on_dtls(skt); - } else if (is_rtp_or_rtcp(reinterpret_cast(skt->data()), skt->size())) { - return on_rtp_or_rtcp(skt); - } + srs_error_t err = srs_success; + + char* data = skt->data(); int size = skt->size(); + SrsRtcSession* rtc_session = find_rtc_session_by_peer_id(skt->get_peer_id()); + + if (rtc_session) { + // Now, we got the RTC session to handle the packet, switch to its context + // to make all logs write to the "correct" pid+cid. + rtc_session->switch_to_context(); + } + + if (is_stun((uint8_t*)data, size)) { + SrsStunPacket sr; + if ((err = sr.decode(data, size)) != srs_success) { + return srs_error_wrap(err, "decode stun packet failed"); + } + srs_verbose("recv stun packet from %s, use-candidate=%d, ice-controlled=%d, ice-controlling=%d", + skt->get_peer_id().c_str(), sr.get_use_candidate(), sr.get_ice_controlled(), sr.get_ice_controlling()); + + if (!rtc_session) { + rtc_session = find_rtc_session_by_username(sr.get_username()); + if (rtc_session) { + rtc_session->switch_to_context(); + } + } + if (rtc_session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, stun username=%s, peer_id=%s", + sr.get_username().c_str(), skt->get_peer_id().c_str()); + } + + return rtc_session->on_stun(skt, &sr); + } else if (is_dtls((uint8_t*)data, size)) { + if (rtc_session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); + } + + return rtc_session->on_dtls(data, size); + } else if (is_rtp_or_rtcp((uint8_t*)data, size)) { + if (rtc_session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); + } + + if (is_rtcp((uint8_t*)data, size)) { + return rtc_session->on_rtcp(data, size); + } else { + return rtc_session->on_rtp(data, size); + } + } return srs_error_new(ERROR_RTC_UDP, "unknown udp packet type"); } @@ -3267,69 +3292,6 @@ SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) return iter->second; } -srs_error_t SrsRtcServer::on_stun(SrsUdpMuxSocket* skt) -{ - srs_error_t err = srs_success; - - SrsStunPacket stun_req; - if ((err = stun_req.decode(skt->data(), skt->size())) != srs_success) { - return srs_error_wrap(err, "decode stun packet failed"); - } - - srs_verbose("recv stun packet from %s, use-candidate=%d, ice-controlled=%d, ice-controlling=%d", - skt->get_peer_id().c_str(), stun_req.get_use_candidate(), stun_req.get_ice_controlled(), stun_req.get_ice_controlling()); - - std::string username = stun_req.get_username(); - SrsRtcSession* rtc_session = find_rtc_session_by_username(username); - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, stun username=%s", username.c_str()); - } - - // Now, we got the RTC session to handle the packet, switch to its context - // to make all logs write to the "correct" pid+cid. - rtc_session->switch_to_context(); - - return rtc_session->on_stun(skt, &stun_req); -} - -srs_error_t SrsRtcServer::on_dtls(SrsUdpMuxSocket* skt) -{ - SrsRtcSession* rtc_session = find_rtc_session_by_peer_id(skt->get_peer_id()); - - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_DTLS, "can not find rtc session by peer_id=%s", skt->get_peer_id().c_str()); - } - - // Now, we got the RTC session to handle the packet, switch to its context - // to make all logs write to the "correct" pid+cid. - rtc_session->switch_to_context(); - - return rtc_session->on_dtls(skt); -} - -srs_error_t SrsRtcServer::on_rtp_or_rtcp(SrsUdpMuxSocket* skt) -{ - srs_error_t err = srs_success; - - SrsRtcSession* rtc_session = find_rtc_session_by_peer_id(skt->get_peer_id()); - - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_RTP, "can not find rtc session by peer_id=%s", skt->get_peer_id().c_str()); - } - - // Now, we got the RTC session to handle the packet, switch to its context - // to make all logs write to the "correct" pid+cid. - rtc_session->switch_to_context(); - - if (is_rtcp(reinterpret_cast(skt->data()), skt->size())) { - err = rtc_session->on_rtcp(skt); - } else { - err = rtc_session->on_rtp(skt); - } - - return err; -} - SrsRtcSession* SrsRtcServer::find_rtc_session_by_username(const std::string& username) { map::iterator iter = map_username_session.find(username); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index b4eb22cfb..3441e5f4d 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -122,8 +122,8 @@ public: srs_error_t initialize(SrsRequest* r); - srs_error_t on_dtls(SrsUdpMuxSocket* skt); - srs_error_t on_dtls_handshake_done(SrsUdpMuxSocket* skt); + srs_error_t on_dtls(char* data, int nb_data); + srs_error_t on_dtls_handshake_done(); srs_error_t on_dtls_application_data(const char* data, const int len); public: srs_error_t protect_rtp(char* protected_buf, const char* ori_buf, int& nb_protected_buf); @@ -132,7 +132,7 @@ public: srs_error_t protect_rtcp(char* protected_buf, const char* ori_buf, int& nb_protected_buf); srs_error_t unprotect_rtcp(char* unprotected_buf, const char* ori_buf, int& nb_unprotected_buf); private: - srs_error_t handshake(SrsUdpMuxSocket* skt); + srs_error_t handshake(); private: srs_error_t srtp_initialize(); srs_error_t srtp_send_init(); @@ -208,8 +208,6 @@ private: uint16_t audio_sequence; private: uint16_t video_sequence; -public: - SrsUdpMuxSocket* sendonly_ukt; private: ISrsUdpSender* sender; private: @@ -221,10 +219,11 @@ private: int mw_msgs; bool realtime; public: - SrsRtcSenderThread(SrsRtcSession* s, SrsUdpMuxSocket* u, int parent_cid); + SrsRtcSenderThread(SrsRtcSession* s, int parent_cid); virtual ~SrsRtcSenderThread(); public: srs_error_t initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt); + void update_sender(ISrsUdpSender* s) { sender = s; } // interface ISrsReloadHandler public: virtual srs_error_t on_reload_rtc_server(); @@ -236,8 +235,6 @@ public: virtual srs_error_t start(); virtual void stop(); virtual void stop_loop(); -public: - void update_sendonly_socket(SrsUdpMuxSocket* skt); public: virtual srs_error_t cycle(); private: @@ -258,8 +255,6 @@ class SrsRtcPublisher : virtual public ISrsHourGlass { private: SrsHourGlass* report_timer; -public: - SrsUdpMuxSocket* sendonly_ukt; private: SrsRtcSession* rtc_session; uint32_t video_ssrc; @@ -281,23 +276,22 @@ public: SrsRtcPublisher(SrsRtcSession* session); virtual ~SrsRtcPublisher(); public: - srs_error_t initialize(SrsUdpMuxSocket* skt, uint32_t vssrc, uint32_t assrc, SrsRequest* req); - srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); - srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); + srs_error_t initialize(uint32_t vssrc, uint32_t assrc, SrsRequest* req); + srs_error_t on_rtcp_sender_report(char* buf, int nb_buf); + srs_error_t on_rtcp_xr(char* buf, int nb_buf); private: - void check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc, SrsUdpMuxSocket* skt); - srs_error_t send_rtcp_rr(SrsUdpMuxSocket* skt, uint32_t ssrc, SrsRtpQueue* rtp_queue); - srs_error_t send_rtcp_xr_rrtr(SrsUdpMuxSocket* skt, uint32_t ssrc); - srs_error_t send_rtcp_fb_pli(SrsUdpMuxSocket* skt, uint32_t ssrc); + void check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc); + srs_error_t send_rtcp_rr(uint32_t ssrc, SrsRtpQueue* rtp_queue); + srs_error_t send_rtcp_xr_rrtr(uint32_t ssrc); + srs_error_t send_rtcp_fb_pli(uint32_t ssrc); public: - srs_error_t on_rtp(SrsUdpMuxSocket* skt, char* buf, int nb_buf); + srs_error_t on_rtp(char* buf, int nb_buf); private: - srs_error_t on_audio(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); + srs_error_t on_audio(SrsRtpSharedPacket* pkt); srs_error_t collect_audio_frame(); - srs_error_t on_video(SrsUdpMuxSocket* skt, SrsRtpSharedPacket* pkt); + srs_error_t on_video(SrsRtpSharedPacket* pkt); srs_error_t collect_video_frame(); public: - void update_sendonly_socket(SrsUdpMuxSocket* skt); void request_keyframe(); // interface ISrsHourGlass public: @@ -311,13 +305,17 @@ class SrsRtcSession friend class SrsRtcPublisher; private: SrsRtcServer* rtc_server; - SrsSdp remote_sdp; - SrsSdp local_sdp; SrsRtcSessionStateType session_state; SrsDtlsSession* dtls_session; SrsRtcSenderThread* sender; + SrsRtcPublisher* publisher; +private: + SrsUdpMuxSocket* sendonly_skt; std::string username; std::string peer_id; +private: + // The timeout of session, keep alive by STUN ping pong. + srs_utime_t sessionStunTimeout; srs_utime_t last_stun_time; private: // For each RTC session, we use a specified cid for debugging logs. @@ -327,17 +325,14 @@ private: // Sepcifies by HTTP API, query encrypt, optional. // TODO: FIXME: Support reload. bool encrypt; - // The timeout of session, keep alive by STUN ping pong. - srs_utime_t sessionStunTimeout; + SrsRequest* req; + SrsSource* source; + SrsSdp remote_sdp; + SrsSdp local_sdp; private: bool blackhole; sockaddr_in* blackhole_addr; srs_netfd_t blackhole_stfd; -public: - SrsRequest* req; - SrsSource* source; -private: - SrsRtcPublisher* publisher; public: SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id); virtual ~SrsRtcSession(); @@ -360,27 +355,28 @@ public: void switch_to_context(); int context_id() { return cid; } + public: srs_error_t initialize(); - srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); - srs_error_t on_dtls(SrsUdpMuxSocket* skt); - srs_error_t on_rtcp(SrsUdpMuxSocket* skt); - srs_error_t on_rtp(SrsUdpMuxSocket* skt); -public: - srs_error_t send_client_hello(SrsUdpMuxSocket* skt); - srs_error_t on_connection_established(SrsUdpMuxSocket* skt); - srs_error_t start_play(SrsUdpMuxSocket* skt); - srs_error_t start_publish(SrsUdpMuxSocket* skt); + // The peer address may change, we can identify that by STUN messages. + srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r); + srs_error_t on_dtls(char* data, int nb_data); + srs_error_t on_rtcp(char* data, int nb_data); + srs_error_t on_rtp(char* data, int nb_data); public: + srs_error_t send_client_hello(); + srs_error_t on_connection_established(); + srs_error_t start_play(); + srs_error_t start_publish(); bool is_stun_timeout(); + void update_sendonly_socket(SrsUdpMuxSocket* skt); private: - srs_error_t on_binding_request(SrsUdpMuxSocket* skt, SrsStunPacket* stun_req); -private: - srs_error_t on_rtcp_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); - srs_error_t on_rtcp_ps_feedback(char* buf, int nb_buf, SrsUdpMuxSocket* skt); - srs_error_t on_rtcp_xr(char* buf, int nb_buf, SrsUdpMuxSocket* skt); - srs_error_t on_rtcp_sender_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); - srs_error_t on_rtcp_receiver_report(char* buf, int nb_buf, SrsUdpMuxSocket* skt); + srs_error_t on_binding_request(SrsStunPacket* r); + srs_error_t on_rtcp_feedback(char* data, int nb_data); + srs_error_t on_rtcp_ps_feedback(char* data, int nb_data); + srs_error_t on_rtcp_xr(char* data, int nb_data); + srs_error_t on_rtcp_sender_report(char* data, int nb_data); + srs_error_t on_rtcp_receiver_report(char* data, int nb_data); }; class SrsUdpMuxSender : virtual public ISrsUdpSender, virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler @@ -455,10 +451,6 @@ public: bool insert_into_id_sessions(const std::string& peer_id, SrsRtcSession* rtc_session); void check_and_clean_timeout_session(); int nn_sessions() { return (int)map_username_session.size(); } -private: - srs_error_t on_stun(SrsUdpMuxSocket* skt); - srs_error_t on_dtls(SrsUdpMuxSocket* skt); - srs_error_t on_rtp_or_rtcp(SrsUdpMuxSocket* skt); private: SrsRtcSession* find_rtc_session_by_username(const std::string& ufrag); SrsRtcSession* find_rtc_session_by_peer_id(const std::string& peer_id); From efbc51f6bed99c71cb1d1f19378b6b6a2d864a8d Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 18:19:40 +0800 Subject: [PATCH 30/79] Refactor RTC sender, donot cache it. --- trunk/src/app/srs_app_rtc_conn.cpp | 14 +++++++------- trunk/src/app/srs_app_rtc_conn.hpp | 3 --- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index c2fbba7c6..cab12402e 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -635,7 +635,6 @@ SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, int parent_cid) trd = new SrsDummyCoroutine(); rtc_session = s; - sender = NULL; gso = false; merge_nalus = false; @@ -773,6 +772,7 @@ srs_error_t SrsRtcSenderThread::cycle() mw_msgs = _srs_config->get_mw_msgs(req->vhost, realtime, true); // We merged write more messages, so we need larger queue. + ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); if (mw_msgs > 2) { sender->set_extra_ratio(150); } else if (mw_msgs > 0) { @@ -904,6 +904,8 @@ srs_error_t SrsRtcSenderThread::messages_to_packets( ) { srs_error_t err = srs_success; + ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); + for (int i = 0; i < nb_msgs; i++) { SrsSharedPtrMessage* msg = msgs[i]; @@ -986,8 +988,9 @@ srs_error_t SrsRtcSenderThread::send_packets(SrsRtcPackets& packets) { srs_error_t err = srs_success; - // Cache the encrypt flag. + // Cache the encrypt flag and sender. bool encrypt = rtc_session->encrypt; + ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); int nn_packets = packets.size(); for (int i = 0; i < nn_packets; i++) { @@ -1053,8 +1056,9 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) { srs_error_t err = srs_success; - // Cache the encrypt flag. + // Cache the encrypt flag and sender. bool encrypt = rtc_session->encrypt; + ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); // Previous handler, if has the same size, we can use GSO. mmsghdr* gso_mhdr = NULL; int gso_size = 0; int gso_encrypt = 0; int gso_cursor = 0; @@ -2596,7 +2600,6 @@ srs_error_t SrsRtcSession::start_play() srs_freep(sender); sender = new SrsRtcSenderThread(this, _srs_context->get_id()); - sender->update_sender(sendonly_skt->sender()); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2781,9 +2784,6 @@ void SrsRtcSession::update_sendonly_socket(SrsUdpMuxSocket* skt) srs_freep(sendonly_skt); sendonly_skt = skt->copy_sendonly(); - if (sender) { - sender->update_sender(skt->sender()); - } } SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 3441e5f4d..927ad78d6 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -208,8 +208,6 @@ private: uint16_t audio_sequence; private: uint16_t video_sequence; -private: - ISrsUdpSender* sender; private: bool merge_nalus; bool gso; @@ -223,7 +221,6 @@ public: virtual ~SrsRtcSenderThread(); public: srs_error_t initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt); - void update_sender(ISrsUdpSender* s) { sender = s; } // interface ISrsReloadHandler public: virtual srs_error_t on_reload_rtc_server(); From d045ce5d74751c887b0e92f0809eb6d03fa051af Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 19:33:08 +0800 Subject: [PATCH 31/79] Refine kernel buffer API. --- trunk/src/kernel/srs_kernel_buffer.cpp | 9 --------- trunk/src/kernel/srs_kernel_buffer.hpp | 1 - trunk/src/kernel/srs_kernel_mp4.cpp | 2 -- trunk/src/kernel/srs_kernel_mp4.hpp | 1 - 4 files changed, 13 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index be94d0bcb..9279a04ff 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -45,15 +45,6 @@ ISrsCodec::~ISrsCodec() { } -SrsBuffer::SrsBuffer() -{ - p = bytes = NULL; - nb_bytes = 0; - - // TODO: support both little and big endian. - srs_assert(srs_is_little_endian()); -} - SrsBuffer::SrsBuffer(char* b, int nb_b) { p = bytes = b; diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index 532375f8d..b46de136c 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -102,7 +102,6 @@ private: // the total number of bytes. int nb_bytes; public: - SrsBuffer(); // Initialize buffer with data b and size nb_b. // @remark User must free the data b. SrsBuffer(char* b, int nb_b); diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index a41f27f56..5f76caf37 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -6276,7 +6276,6 @@ SrsMp4M2tsSegmentEncoder::SrsMp4M2tsSegmentEncoder() writer = NULL; nb_audios = nb_videos = 0; samples = new SrsMp4SampleManager(); - buffer = new SrsBuffer(); sequence_number = 0; decode_basetime = 0; styp_bytes = 0; @@ -6286,7 +6285,6 @@ SrsMp4M2tsSegmentEncoder::SrsMp4M2tsSegmentEncoder() SrsMp4M2tsSegmentEncoder::~SrsMp4M2tsSegmentEncoder() { srs_freep(samples); - srs_freep(buffer); } srs_error_t SrsMp4M2tsSegmentEncoder::initialize(ISrsWriter* w, uint32_t sequence, srs_utime_t basetime, uint32_t tid) diff --git a/trunk/src/kernel/srs_kernel_mp4.hpp b/trunk/src/kernel/srs_kernel_mp4.hpp index ea12508b6..8f3142029 100644 --- a/trunk/src/kernel/srs_kernel_mp4.hpp +++ b/trunk/src/kernel/srs_kernel_mp4.hpp @@ -2105,7 +2105,6 @@ class SrsMp4M2tsSegmentEncoder { private: ISrsWriter* writer; - SrsBuffer* buffer; uint32_t sequence_number; srs_utime_t decode_basetime; uint32_t track_id; From 7b5fa0e3912b08e7119b70f8f5752913a754972b Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Apr 2020 20:46:45 +0800 Subject: [PATCH 32/79] Refactor kernel buffer --- trunk/src/kernel/srs_kernel_buffer.cpp | 4 +- trunk/src/kernel/srs_kernel_buffer.hpp | 108 ++++++++----------------- 2 files changed, 35 insertions(+), 77 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index 9279a04ff..7f62d6b5a 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -45,10 +45,10 @@ ISrsCodec::~ISrsCodec() { } -SrsBuffer::SrsBuffer(char* b, int nb_b) +SrsBuffer::SrsBuffer(char* b, int nn) { p = bytes = b; - nb_bytes = nb_b; + nb_bytes = nn; // TODO: support both little and big endian. srs_assert(srs_is_little_endian()); diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index b46de136c..ce8852c87 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -97,117 +97,75 @@ class SrsBuffer private: // current position at bytes. char* p; - // the bytes data for stream to read or write. + // the bytes data for buffer to read or write. char* bytes; // the total number of bytes. int nb_bytes; public: - // Initialize buffer with data b and size nb_b. + // Create buffer with data b and size nn. // @remark User must free the data b. - SrsBuffer(char* b, int nb_b); + SrsBuffer(char* b, int nn); virtual ~SrsBuffer(); -// get the status of stream public: - /** - * get data of stream, set by initialize. - * current bytes = data() + pos() - */ + // Get the data and head of buffer. + // current-bytes = head() = data() + pos() inline char* data() { return bytes; } inline char* head() { return p; } - /** - * the total stream size, set by initialize. - * left bytes = size() - pos(). - */ + // Get the total size of buffer. + // left-bytes = size() - pos() virtual int size(); - /** - * tell the current pos. - */ + void set_size(int v) { nb_bytes = v; } + // Get the current buffer position. virtual int pos(); // Left bytes in buffer, total size() minus the current pos(). virtual int left(); - /** - * whether stream is empty. - * if empty, user should never read or write. - */ + // Whether buffer is empty. virtual bool empty(); - /** - * whether required size is ok. - * @return true if stream can read/write specified required_size bytes. - * @remark assert required_size positive. - */ + // Whether buffer is able to supply required size of bytes. + // @remark User should check buffer by require then do read/write. + // @remark Assert the required_size is not negative. virtual bool require(int required_size); - // to change stream. public: - /** - * to skip some size. - * @param size can be any value. positive to forward; nagetive to backward. - * @remark to skip(pos()) to reset stream. - * @remark assert initialized, the data() not NULL. - */ + // Skip some size. + // @param size can be any value. positive to forward; nagetive to backward. + // @remark to skip(pos()) to reset buffer. + // @remark assert initialized, the data() not NULL. virtual void skip(int size); public: - /** - * get 1bytes char from stream. - */ + // Read 1bytes char from buffer. virtual int8_t read_1bytes(); - /** - * get 2bytes int from stream. - */ + // Read 2bytes int from buffer. virtual int16_t read_2bytes(); - /** - * get 3bytes int from stream. - */ + // Read 3bytes int from buffer. virtual int32_t read_3bytes(); - /** - * get 4bytes int from stream. - */ + // Read 4bytes int from buffer. virtual int32_t read_4bytes(); - /** - * get 8bytes int from stream. - */ + // Read 8bytes int from buffer. virtual int64_t read_8bytes(); - /** - * get string from stream, length specifies by param len. - */ + // Read string from buffer, length specifies by param len. virtual std::string read_string(int len); - /** - * get bytes from stream, length specifies by param len. - */ + // Read bytes from buffer, length specifies by param len. virtual void read_bytes(char* data, int size); public: - /** - * write 1bytes char to stream. - */ + // Write 1bytes char to buffer. virtual void write_1bytes(int8_t value); - /** - * write 2bytes int to stream. - */ + // Write 2bytes int to buffer. virtual void write_2bytes(int16_t value); - /** - * write 4bytes int to stream. - */ + // Write 4bytes int to buffer. virtual void write_4bytes(int32_t value); - /** - * write 3bytes int to stream. - */ + // Write 3bytes int to buffer. virtual void write_3bytes(int32_t value); - /** - * write 8bytes int to stream. - */ + // Write 8bytes int to buffer. virtual void write_8bytes(int64_t value); - /** - * write string to stream - */ + // Write string to buffer virtual void write_string(std::string value); - /** - * write bytes to stream - */ + // Write bytes to buffer virtual void write_bytes(char* data, int size); }; /** - * the bit stream, base on SrsBuffer, - * for exmaple, the h.264 avc stream is bit stream. + * the bit buffer, base on SrsBuffer, + * for exmaple, the h.264 avc buffer is bit buffer. */ class SrsBitBuffer { From 6f2b78f16afd57cabb5d2438e850e460826aa5c4 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 09:15:49 +0800 Subject: [PATCH 33/79] Refactor code to keep sample function order --- trunk/src/app/srs_app_rtc_conn.cpp | 1002 +++++++++++++----------- trunk/src/app/srs_app_rtc_conn.hpp | 45 +- trunk/src/app/srs_app_rtp_queue.cpp | 74 +- trunk/src/app/srs_app_rtp_queue.hpp | 23 +- trunk/src/kernel/srs_kernel_buffer.cpp | 15 + trunk/src/kernel/srs_kernel_buffer.hpp | 54 +- trunk/src/kernel/srs_kernel_flv.cpp | 40 + trunk/src/kernel/srs_kernel_flv.hpp | 16 +- trunk/src/kernel/srs_kernel_rtp.cpp | 242 +++++- trunk/src/kernel/srs_kernel_rtp.hpp | 69 +- 10 files changed, 987 insertions(+), 593 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index cab12402e..686ccbb88 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -125,41 +125,6 @@ static std::vector get_candidate_ips() return candidate_ips; } - -static int cal_rtp_frame_size(const vector& frame, int& frame_size, vector& nalu_lens) -{ - uint32_t nalu_len = 0; - for (size_t n = 0; n < frame.size(); ++n) { - SrsRtpH264Header* rtp_h264_header = dynamic_cast(frame[n]->rtp_payload_header); - for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { - if (rtp_h264_header->nalu_type != kFuA) { - uint8_t* p = reinterpret_cast(frame[n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); - if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSPS) && - ((p[0] & kNalTypeMask) != SrsAvcNaluTypePPS)) { - frame_size += rtp_h264_header->nalu_offset[j].second + 4; - nalu_lens.push_back(rtp_h264_header->nalu_offset[j].second); - } - } else { - if (frame[n]->rtp_payload_header->is_first_packet_of_frame) { - frame_size += 5; - nalu_len += 1; - } - frame_size += rtp_h264_header->nalu_offset[j].second; - nalu_len += rtp_h264_header->nalu_offset[j].second; - - if (frame[n]->rtp_payload_header->is_last_packet_of_frame) { - nalu_lens.push_back(nalu_len); - nalu_len = 0; - } - } - } - } - - return frame_size; -} - uint64_t SrsNtp::kMagicNtpFractionalUnit = 1ULL << 32; SrsNtp::SrsNtp() @@ -1501,7 +1466,6 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) rtc_session = session; rtp_h264_demuxer = new SrsRtpH264Demuxer(); - rtp_opus_demuxer = new SrsRtpOpusDemuxer(); rtp_video_queue = new SrsRtpQueue(1000); rtp_audio_queue = new SrsRtpQueue(100, true); @@ -1519,7 +1483,6 @@ SrsRtcPublisher::~SrsRtcPublisher() srs_freep(report_timer); srs_freep(rtp_h264_demuxer); - srs_freep(rtp_opus_demuxer); srs_freep(rtp_video_queue); srs_freep(rtp_audio_queue); } @@ -1904,32 +1867,55 @@ srs_error_t SrsRtcPublisher::on_rtp(char* buf, int nb_buf) { srs_error_t err = srs_success; - SrsRtpSharedPacket* pkt = new SrsRtpSharedPacket(); - SrsAutoFree(SrsRtpSharedPacket, pkt); - if ((err = pkt->decode(buf, nb_buf)) != srs_success) { - return srs_error_wrap(err, "rtp packet decode failed"); + SrsRtpPacket2* pkt = new SrsRtpPacket2(); + + pkt->set_decode_handler(this); + pkt->set_original_bytes(buf, nb_buf); + + SrsBuffer b(buf, nb_buf); + if ((err = pkt->decode(&b)) != srs_success) { + return srs_error_wrap(err, "decode rtp packet"); } uint32_t ssrc = pkt->rtp_header.get_ssrc(); - if (ssrc == audio_ssrc) { return on_audio(pkt); } else if (ssrc == video_ssrc) { return on_video(pkt); + } else { + srs_freep(pkt); + return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); } - - return srs_error_new(ERROR_RTC_RTP, "unknown ssrc=%u", ssrc); } -srs_error_t SrsRtcPublisher::on_audio(SrsRtpSharedPacket* pkt) +void SrsRtcPublisher::on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsCodec** ppayload) { - srs_error_t err = srs_success; - - pkt->rtp_payload_header = new SrsRtpOpusHeader(); - if ((err = rtp_opus_demuxer->parse(pkt)) != srs_success) { - return srs_error_wrap(err, "rtp opus demux failed"); + // No payload, ignore. + if (buf->empty()) { + return; } + uint32_t ssrc = pkt->rtp_header.get_ssrc(); + if (ssrc == audio_ssrc) { + *ppayload = pkt->reuse_raw(); + } else if (ssrc == video_ssrc) { + uint8_t v = (uint8_t)pkt->nalu_type; + if (v == kStapA) { + *ppayload = new SrsRtpSTAPPayload(); + } else if (v == kFuA) { + *ppayload = pkt->reuse_fua(); + } else { + *ppayload = pkt->reuse_raw(); + } + } +} + +srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) +{ + pkt->is_first_packet_of_frame = true; + pkt->is_last_packet_of_frame = true; + pkt->is_key_frame = true; + // TODO: FIXME: Error check. rtp_audio_queue->consume(pkt); @@ -1940,42 +1926,24 @@ srs_error_t SrsRtcPublisher::on_audio(SrsRtpSharedPacket* pkt) check_send_nacks(rtp_audio_queue, audio_ssrc); - return collect_audio_frame(); + return collect_audio_frames(); } -srs_error_t SrsRtcPublisher::collect_audio_frame() +srs_error_t SrsRtcPublisher::collect_audio_frames() { srs_error_t err = srs_success; - std::vector > framess; - rtp_audio_queue->collect_frames(framess); + std::vector > frames; + rtp_audio_queue->collect_frames(frames); - for (size_t i = 0; i < framess.size(); ++i) { - vector frames = framess[i]; + for (size_t i = 0; i < frames.size(); ++i) { + vector& packets = frames[i]; - for (size_t j = 0; j < frames.size(); ++j) { - SrsRtpSharedPacket* pkt = frames[j]; + for (size_t j = 0; j < packets.size(); ++j) { + SrsRtpPacket2* pkt = packets[j]; - // TODO: FIXME: Transcode OPUS to AAC. - if (pkt->rtp_payload_size() > 0) { - SrsMessageHeader header; - header.message_type = RTMP_MSG_AudioMessage; - // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = pkt->rtp_header.get_timestamp() / 90; - - SrsSharedPtrMessage msg; - // TODO: FIXME: Check error. - msg.create(&header, NULL, 0); - - SrsSample sample; - sample.size = pkt->rtp_payload_size(); - sample.bytes = new char[sample.size]; - memcpy((void*)sample.bytes, pkt->rtp_payload(), sample.size); - msg.set_extra_payloads(&sample, 1); - - // TODO: FIXME: Check error. - source->on_rtc_audio(&msg); - } + // TODO: FIXME: Check error. + do_collect_audio_frame(pkt); srs_freep(pkt); } @@ -1984,14 +1952,64 @@ srs_error_t SrsRtcPublisher::collect_audio_frame() return err; } -srs_error_t SrsRtcPublisher::on_video(SrsRtpSharedPacket* pkt) +srs_error_t SrsRtcPublisher::do_collect_audio_frame(SrsRtpPacket2* pkt) { srs_error_t err = srs_success; - pkt->rtp_payload_header = new SrsRtpH264Header(); + SrsRtpRawPayload* payload = dynamic_cast(pkt->payload); - if ((err = rtp_h264_demuxer->parse(pkt)) != srs_success) { - return srs_error_wrap(err, "rtp h264 demux failed"); + if (!payload) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "OPUS payload"); + } + + // TODO: FIXME: Transcode OPUS to AAC. + if (!payload->nn_payload) { + return err; + } + + SrsMessageHeader header; + header.message_type = RTMP_MSG_AudioMessage; + // TODO: FIXME: Maybe the tbn is not 90k. + header.timestamp = pkt->rtp_header.get_timestamp() / 90; + + SrsSharedPtrMessage msg; + // TODO: FIXME: Check error. + msg.create(&header, NULL, 0); + + SrsSample sample; + sample.size = payload->nn_payload; + sample.bytes = new char[sample.size]; + memcpy((void*)sample.bytes, payload->payload, sample.size); + msg.set_extra_payloads(&sample, 1); + + // TODO: FIXME: Check error. + source->on_rtc_audio(&msg); + + return err; +} + +srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) +{ + uint8_t v = (uint8_t)pkt->nalu_type; + if (v == kFuA) { + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + if (!payload) { + srs_freep(pkt); + return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); + } + + pkt->is_first_packet_of_frame = payload->start; + pkt->is_last_packet_of_frame = payload->end; + pkt->is_key_frame = (payload->nalu_type == SrsAvcNaluTypeIDR); + } else { + pkt->is_first_packet_of_frame = true; + pkt->is_last_packet_of_frame = true; + + if (v == kStapA) { + pkt->is_key_frame = true; + } else { + pkt->is_key_frame = (pkt->nalu_type == SrsAvcNaluTypeIDR); + } } // TODO: FIXME: Error check. @@ -2004,155 +2022,200 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpSharedPacket* pkt) check_send_nacks(rtp_video_queue, video_ssrc); - return collect_video_frame(); + return collect_video_frames(); } -srs_error_t SrsRtcPublisher::collect_video_frame() +srs_error_t SrsRtcPublisher::collect_video_frames() { - srs_error_t err = srs_success; - - std::vector > frames; + std::vector > frames; rtp_video_queue->collect_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { - if (!frames[i].empty()) { - srs_verbose("collect %d video frames, seq range %u,%u", - frames.size(), frames[i].front()->rtp_header.get_sequence(), - frames[i].back()->rtp_header.get_sequence()); + vector& packets = frames[i]; + if (packets.empty()) { + continue; } - int frame_size = 5; - vector nalu_lens; - cal_rtp_frame_size(frames[i], frame_size, nalu_lens); + // TODO: FIXME: Check error. + do_collect_video_frame(packets); - uint8_t* frame_buffer = new uint8_t[frame_size]; - // Skip flv video tag header. - int frame_buffer_index = 5; - - bool video_header_change = false; - int64_t timestamp = 0; - - bool idr = false; - size_t len_index = 0; - for (size_t n = 0; n < frames[i].size(); ++n) { - SrsRtpH264Header* rtp_h264_header = dynamic_cast(frames[i][n]->rtp_payload_header); - for (size_t j = 0; j < rtp_h264_header->nalu_offset.size(); ++j) { - timestamp = frames[i][n]->rtp_header.get_timestamp(); - - uint8_t* p = reinterpret_cast(frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first); - if (rtp_h264_header->nalu_type != kFuA) { - if ((p[0] & kNalTypeMask) == SrsAvcNaluTypeSPS) { - string cur_sps = string((char*)p, rtp_h264_header->nalu_offset[j].second); - if (!cur_sps.empty() && sps != cur_sps) { - video_header_change = true; - sps = cur_sps; - } - } else if ((p[0] & kNalTypeMask) == SrsAvcNaluTypePPS) { - string cur_pps = string((char*)p, rtp_h264_header->nalu_offset[j].second); - if (!cur_pps.empty() && pps != cur_pps) { - video_header_change = true; - pps = cur_pps; - } - } else if (((p[0] & kNalTypeMask) != SrsAvcNaluTypeAccessUnitDelimiter) && ((p[0] & kNalTypeMask) != SrsAvcNaluTypeSEI)) { - uint32_t len = nalu_lens[len_index++]; - SrsBuffer stream((char*)frame_buffer + frame_buffer_index, 4); - stream.write_4bytes(len); - frame_buffer_index += 4; - memcpy(frame_buffer + frame_buffer_index, p, rtp_h264_header->nalu_offset[j].second); - frame_buffer_index += rtp_h264_header->nalu_offset[j].second; - } - } else { - if (frames[i][n]->rtp_payload_header->is_first_packet_of_frame) { - uint32_t len = nalu_lens[len_index++]; - SrsBuffer stream((char*)frame_buffer + frame_buffer_index, 4); - stream.write_4bytes(len); - frame_buffer_index += 4; - frame_buffer[frame_buffer_index++] = rtp_h264_header->nalu_header; - - if ((rtp_h264_header->nalu_header & kNalTypeMask) == SrsAvcNaluTypeIDR) { - idr = true; - } - } - memcpy(frame_buffer + frame_buffer_index, frames[i][n]->rtp_payload() + rtp_h264_header->nalu_offset[j].first, - rtp_h264_header->nalu_offset[j].second); - frame_buffer_index += rtp_h264_header->nalu_offset[j].second; - } - } - srs_freep(frames[i][n]); - } - - if (video_header_change) { - srs_verbose("sps/pps change or init"); - - uint8_t* video_header = new uint8_t[1500]; - SrsBuffer *stream = new SrsBuffer((char*)video_header, 1500); - SrsAutoFree(SrsBuffer, stream); - stream->write_1bytes(0x17); - stream->write_1bytes(0x00); - stream->write_1bytes(0x00); - stream->write_1bytes(0x00); - stream->write_1bytes(0x00); - - // FIXME: Replace magic number. - stream->write_1bytes(0x01); - stream->write_1bytes(0x42); - stream->write_1bytes(0xC0); - stream->write_1bytes(0x1E); - stream->write_1bytes(0xFF); - stream->write_1bytes(0xE1); - - stream->write_2bytes(sps.size()); - stream->write_string(sps); - - stream->write_1bytes(0x01); - - stream->write_2bytes(pps.size()); - stream->write_string(pps); - - SrsMessageHeader header; - header.message_type = RTMP_MSG_VideoMessage; - // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = timestamp / 90; - SrsCommonMessage* shared_video = new SrsCommonMessage(); - SrsAutoFree(SrsCommonMessage, shared_video); - // TODO: FIXME: Check error. - shared_video->create(&header, reinterpret_cast(video_header), stream->pos()); - srs_error_t e = source->on_video(shared_video); - if (e != srs_success) { - srs_warn("on video header err=%s", srs_error_desc(e).c_str()); - srs_error_reset(e); - } - - srs_verbose("rtp on video header"); - } - - if (!sps.empty() && !pps.empty()) { - if (idr) { - frame_buffer[0] = 0x17; - } else { - frame_buffer[0] = 0x27; - } - frame_buffer[1] = 0x01; - frame_buffer[2] = 0x00; - frame_buffer[3] = 0x00; - frame_buffer[4] = 0x00; - - SrsMessageHeader header; - header.message_type = RTMP_MSG_VideoMessage; - // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = timestamp / 90; - SrsCommonMessage* shared_video = new SrsCommonMessage(); - SrsAutoFree(SrsCommonMessage, shared_video); - // TODO: FIXME: Check error. - shared_video->create(&header, reinterpret_cast(frame_buffer), frame_buffer_index); - srs_error_t e = source->on_video(shared_video); - if (e != srs_success) { - srs_warn("on video err=%s", srs_error_desc(e).c_str()); - } + for (size_t j = 0; j < packets.size(); ++j) { + SrsRtpPacket2* pkt = packets[j]; + srs_freep(pkt); } } - return err; + return srs_success; +} + +srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& packets) +{ + srs_error_t err = srs_success; + + // Although a video frame may contain many packets, they share the same NALU type. + SrsRtpPacket2* head = packets.at(0); + SrsAvcNaluType nalu_type = head->nalu_type; + int64_t timestamp = head->rtp_header.get_timestamp(); + + if (nalu_type == (SrsAvcNaluType)kFuA) { + // For FU-A, there must be more than one packets. + if (packets.size() < 2) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A %d packets", packets.size()); + } + } else { + // For others type, should be one packet for one frame. + if (packets.size() != 1) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "NonFU-A %d packets", packets.size()); + } + } + + // For FU-A, group packets to one video frame. + if (nalu_type == (SrsAvcNaluType)kFuA) { + int nn_payload = 0; + for (size_t i = 0; i < packets.size(); ++i) { + SrsRtpPacket2* pkt = packets[i]; + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + if (!payload) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); + } + nn_payload += payload->size; + } + if (!nn_payload) { + return err; + } + + // TODO: FIXME: Directly covert to sample for performance. + // 1 byte NALU header. + // 5 bytes FLV tag header. + nn_payload += 1 + 5; + char* data = new char[nn_payload]; + SrsRtpFUAPayload2* head_payload = dynamic_cast(head->payload); + + char* p = data + 5; + *p++ = head_payload->nri | head_payload->nalu_type; + + for (size_t i = 0; i < packets.size(); ++i) { + SrsRtpPacket2* pkt = packets[i]; + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + memcpy(p, payload->payload, payload->size); + p += payload->size; + } + + if (head_payload->nalu_type == SrsAvcNaluTypeIDR) { + data[0] = 0x17; + } else { + data[0] = 0x27; + } + data[1] = 0x01; + data[2] = 0x00; + data[3] = 0x00; + data[4] = 0x00; + + SrsMessageHeader header; + header.message_type = RTMP_MSG_VideoMessage; + // TODO: FIXME: Maybe the tbn is not 90k. + header.timestamp = timestamp / 90; + SrsCommonMessage* shared_video = new SrsCommonMessage(); + SrsAutoFree(SrsCommonMessage, shared_video); + // TODO: FIXME: Check error. + shared_video->create(&header, data, nn_payload); + return source->on_video(shared_video); + } + + // For STAP-A, it must be SPS/PPS, and only one packet. + if (nalu_type == (SrsAvcNaluType)kStapA) { + SrsRtpPacket2* pkt = head; + SrsRtpSTAPPayload* payload = dynamic_cast(pkt->payload); + if (!payload) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload"); + } + if (payload->nalus.size() != 2) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload %d nalus", payload->nalus.size()); + } + + SrsSample* sps = payload->nalus[0]; + SrsSample* pps = payload->nalus[1]; + if (!sps->size || !pps->size) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload %d sps, %d pps", sps->size, pps->size); + } + + // TODO: FIXME: Directly covert to sample for performance. + // 5 bytes flv tag header. + // 6 bytes sps/pps sequence header. + // 1 byte seperator between sps and pps. + int nn_payload = sps->size + pps->size + 5 + 6 + 1; + char* data = new char[nn_payload]; + SrsBuffer buf(data, nn_payload); + buf.write_1bytes(0x17); + buf.write_1bytes(0x00); + buf.write_1bytes(0x00); + buf.write_1bytes(0x00); + buf.write_1bytes(0x00); + + // FIXME: Replace magic number for avc_demux_sps_pps. + buf.write_1bytes(0x01); + buf.write_1bytes(0x42); + buf.write_1bytes(0xC0); + buf.write_1bytes(0x1E); + buf.write_1bytes(0xFF); + buf.write_1bytes(0xE1); + + buf.write_2bytes(sps->size); + buf.write_string(sps->bytes); + + buf.write_1bytes(0x01); + + buf.write_2bytes(pps->size); + buf.write_string(pps->bytes); + + SrsMessageHeader header; + header.message_type = RTMP_MSG_VideoMessage; + // TODO: FIXME: Maybe the tbn is not 90k. + header.timestamp = timestamp / 90; + SrsCommonMessage* shared_video = new SrsCommonMessage(); + SrsAutoFree(SrsCommonMessage, shared_video); + // TODO: FIXME: Check error. + shared_video->create(&header, data, nn_payload); + return source->on_video(shared_video); + } + + // For RAW NALU, should be one RAW packet. + SrsRtpPacket2* pkt = head; + SrsRtpRawPayload* payload = dynamic_cast(pkt->payload); + if (!payload) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "RAW-NALU payload"); + } + if (!payload->nn_payload) { + return err; + } + + // TODO: FIXME: Directly covert to sample for performance. + // 1 byte NALU header. + // 5 bytes FLV tag header. + int nn_payload = payload->nn_payload + 1 + 5; + char* data = new char[nn_payload]; + + if (nalu_type == SrsAvcNaluTypeIDR) { + data[0] = 0x17; + } else { + data[0] = 0x27; + } + data[1] = 0x01; + data[2] = 0x00; + data[3] = 0x00; + data[4] = 0x00; + + memcpy(data + 5, payload->payload, payload->nn_payload); + + SrsMessageHeader header; + header.message_type = RTMP_MSG_VideoMessage; + // TODO: FIXME: Maybe the tbn is not 90k. + header.timestamp = timestamp / 90; + SrsCommonMessage* shared_video = new SrsCommonMessage(); + SrsAutoFree(SrsCommonMessage, shared_video); + // TODO: FIXME: Check error. + shared_video->create(&header, data, nn_payload); + return source->on_video(shared_video); } void SrsRtcPublisher::request_keyframe() @@ -2211,16 +2274,67 @@ SrsRtcSession::~SrsRtcSession() srs_freep(sendonly_skt); } +SrsSdp* SrsRtcSession::get_local_sdp() +{ + return &local_sdp; +} + void SrsRtcSession::set_local_sdp(const SrsSdp& sdp) { local_sdp = sdp; } +SrsSdp* SrsRtcSession::get_remote_sdp() +{ + return &remote_sdp; +} + +void SrsRtcSession::set_remote_sdp(const SrsSdp& sdp) +{ + remote_sdp = sdp; +} + +SrsRtcSessionStateType SrsRtcSession::get_session_state() +{ + return session_state; +} + +void SrsRtcSession::set_session_state(SrsRtcSessionStateType state) +{ + session_state = state; +} + +std::string SrsRtcSession::id() const +{ + return peer_id + "_" + username; +} + + +std::string SrsRtcSession::get_peer_id() const +{ + return peer_id; +} + +void SrsRtcSession::set_peer_id(const std::string& id) +{ + peer_id = id; +} + +void SrsRtcSession::set_encrypt(bool v) +{ + encrypt = v; +} + void SrsRtcSession::switch_to_context() { _srs_context->set_id(cid); } +int SrsRtcSession::context_id() +{ + return cid; +} + srs_error_t SrsRtcSession::initialize() { srs_error_t err = srs_success; @@ -2290,6 +2404,222 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r) return err; } +srs_error_t SrsRtcSession::on_dtls(char* data, int nb_data) +{ + return dtls_session->on_dtls(data, nb_data); +} + +srs_error_t SrsRtcSession::on_rtcp(char* data, int nb_data) +{ + srs_error_t err = srs_success; + + if (dtls_session == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); + } + + char unprotected_buf[kRtpPacketSize]; + int nb_unprotected_buf = nb_data; + if ((err = dtls_session->unprotect_rtcp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { + return srs_error_wrap(err, "rtcp unprotect failed"); + } + + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = unprotected_buf; int len = nb_unprotected_buf; + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + + char* ph = unprotected_buf; + int nb_left = nb_unprotected_buf; + while (nb_left) { + uint8_t payload_type = ph[1]; + uint16_t length_4bytes = (((uint16_t)ph[2]) << 8) | ph[3]; + + int length = (length_4bytes + 1) * 4; + + if (length > nb_unprotected_buf) { + return srs_error_new(ERROR_RTC_RTCP, "invalid rtcp packet, length=%u", length); + } + + srs_verbose("on rtcp, payload_type=%u", payload_type); + + switch (payload_type) { + case kSR: { + err = on_rtcp_sender_report(ph, length); + break; + } + case kRR: { + err = on_rtcp_receiver_report(ph, length); + break; + } + case kSDES: { + break; + } + case kBye: { + break; + } + case kApp: { + break; + } + case kRtpFb: { + err = on_rtcp_feedback(ph, length); + break; + } + case kPsFb: { + err = on_rtcp_ps_feedback(ph, length); + break; + } + case kXR: { + err = on_rtcp_xr(ph, length); + break; + } + default:{ + return srs_error_new(ERROR_RTC_RTCP_CHECK, "unknown rtcp type=%u", payload_type); + break; + } + } + + if (err != srs_success) { + return srs_error_wrap(err, "rtcp"); + } + + ph += length; + nb_left -= length; + } + + return err; +} + +srs_error_t SrsRtcSession::on_rtp(char* data, int nb_data) +{ + srs_error_t err = srs_success; + + if (publisher == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); + } + + if (dtls_session == NULL) { + return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); + } + + int nb_unprotected_buf = nb_data; + char* unprotected_buf = new char[kRtpPacketSize]; + if ((err = dtls_session->unprotect_rtp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { + srs_freepa(unprotected_buf); + return srs_error_wrap(err, "rtp unprotect failed"); + } + + if (blackhole && blackhole_addr && blackhole_stfd) { + // Ignore any error for black-hole. + void* p = unprotected_buf; int len = nb_unprotected_buf; + srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + + return publisher->on_rtp(unprotected_buf, nb_unprotected_buf); +} + +srs_error_t SrsRtcSession::on_connection_established() +{ + srs_error_t err = srs_success; + + srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); + + if (!local_sdp.media_descs_.empty() && + (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { + if ((err = start_publish()) != srs_success) { + return srs_error_wrap(err, "start publish"); + } + } + + if (!local_sdp.media_descs_.empty() && + (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { + if ((err = start_play()) != srs_success) { + return srs_error_wrap(err, "start play"); + } + } + + return err; +} + +srs_error_t SrsRtcSession::start_play() +{ + srs_error_t err = srs_success; + + srs_freep(sender); + sender = new SrsRtcSenderThread(this, _srs_context->get_id()); + + uint32_t video_ssrc = 0; + uint32_t audio_ssrc = 0; + uint16_t video_payload_type = 0; + uint16_t audio_payload_type = 0; + for (size_t i = 0; i < local_sdp.media_descs_.size(); ++i) { + const SrsMediaDesc& media_desc = local_sdp.media_descs_[i]; + if (media_desc.is_audio()) { + audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; + audio_payload_type = media_desc.payload_types_[0].payload_type_; + } else if (media_desc.is_video()) { + video_ssrc = media_desc.ssrc_infos_[0].ssrc_; + video_payload_type = media_desc.payload_types_[0].payload_type_; + } + } + + if ((err = sender->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { + return srs_error_wrap(err, "SrsRtcSenderThread init"); + } + + if ((err = sender->start()) != srs_success) { + return srs_error_wrap(err, "start SrsRtcSenderThread"); + } + + return err; +} + +srs_error_t SrsRtcSession::start_publish() +{ + srs_error_t err = srs_success; + + srs_freep(publisher); + publisher = new SrsRtcPublisher(this); + + uint32_t video_ssrc = 0; + uint32_t audio_ssrc = 0; + for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { + const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; + if (media_desc.is_audio()) { + if (!media_desc.ssrc_infos_.empty()) { + audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; + } + } else if (media_desc.is_video()) { + if (!media_desc.ssrc_infos_.empty()) { + video_ssrc = media_desc.ssrc_infos_[0].ssrc_; + } + } + } + + // FIXME: err process. + if ((err = publisher->initialize(video_ssrc, audio_ssrc, req)) != srs_success) { + return srs_error_wrap(err, "rtc publisher init"); + } + + return err; +} + +bool SrsRtcSession::is_stun_timeout() +{ + return last_stun_time + sessionStunTimeout < srs_get_system_time(); +} + +void SrsRtcSession::update_sendonly_socket(SrsUdpMuxSocket* skt) +{ + if (sendonly_skt) { + srs_trace("session %s address changed, update %s -> %s", + id().c_str(), sendonly_skt->get_peer_id().c_str(), skt->get_peer_id().c_str()); + } + + srs_freep(sendonly_skt); + sendonly_skt = skt->copy_sendonly(); +} + #ifdef SRS_OSX // These functions are similar to the older byteorder(3) family of functions. // For example, be32toh() is identical to ntohl(). @@ -2571,221 +2901,6 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ return err; } -srs_error_t SrsRtcSession::on_connection_established() -{ - srs_error_t err = srs_success; - - srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); - - if (!local_sdp.media_descs_.empty() && - (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { - if ((err = start_publish()) != srs_success) { - return srs_error_wrap(err, "start publish"); - } - } - - if (!local_sdp.media_descs_.empty() && - (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { - if ((err = start_play()) != srs_success) { - return srs_error_wrap(err, "start play"); - } - } - - return err; -} - -srs_error_t SrsRtcSession::start_play() -{ - srs_error_t err = srs_success; - - srs_freep(sender); - sender = new SrsRtcSenderThread(this, _srs_context->get_id()); - - uint32_t video_ssrc = 0; - uint32_t audio_ssrc = 0; - uint16_t video_payload_type = 0; - uint16_t audio_payload_type = 0; - for (size_t i = 0; i < local_sdp.media_descs_.size(); ++i) { - const SrsMediaDesc& media_desc = local_sdp.media_descs_[i]; - if (media_desc.is_audio()) { - audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; - audio_payload_type = media_desc.payload_types_[0].payload_type_; - } else if (media_desc.is_video()) { - video_ssrc = media_desc.ssrc_infos_[0].ssrc_; - video_payload_type = media_desc.payload_types_[0].payload_type_; - } - } - - if ((err = sender->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { - return srs_error_wrap(err, "SrsRtcSenderThread init"); - } - - if ((err = sender->start()) != srs_success) { - return srs_error_wrap(err, "start SrsRtcSenderThread"); - } - - return err; -} - -srs_error_t SrsRtcSession::start_publish() -{ - srs_error_t err = srs_success; - - srs_freep(publisher); - publisher = new SrsRtcPublisher(this); - - uint32_t video_ssrc = 0; - uint32_t audio_ssrc = 0; - for (size_t i = 0; i < remote_sdp.media_descs_.size(); ++i) { - const SrsMediaDesc& media_desc = remote_sdp.media_descs_[i]; - if (media_desc.is_audio()) { - if (!media_desc.ssrc_infos_.empty()) { - audio_ssrc = media_desc.ssrc_infos_[0].ssrc_; - } - } else if (media_desc.is_video()) { - if (!media_desc.ssrc_infos_.empty()) { - video_ssrc = media_desc.ssrc_infos_[0].ssrc_; - } - } - } - - // FIXME: err process. - if ((err = publisher->initialize(video_ssrc, audio_ssrc, req)) != srs_success) { - return srs_error_wrap(err, "rtc publisher init"); - } - - return err; -} - -bool SrsRtcSession::is_stun_timeout() -{ - return last_stun_time + sessionStunTimeout < srs_get_system_time(); -} - -srs_error_t SrsRtcSession::on_dtls(char* data, int nb_data) -{ - return dtls_session->on_dtls(data, nb_data); -} - -srs_error_t SrsRtcSession::on_rtcp(char* data, int nb_data) -{ - srs_error_t err = srs_success; - - if (dtls_session == NULL) { - return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); - } - - char unprotected_buf[kRtpPacketSize]; - int nb_unprotected_buf = nb_data; - if ((err = dtls_session->unprotect_rtcp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { - return srs_error_wrap(err, "rtcp unprotect failed"); - } - - if (blackhole && blackhole_addr && blackhole_stfd) { - // Ignore any error for black-hole. - void* p = unprotected_buf; int len = nb_unprotected_buf; - srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); - } - - char* ph = unprotected_buf; - int nb_left = nb_unprotected_buf; - while (nb_left) { - uint8_t payload_type = ph[1]; - uint16_t length_4bytes = (((uint16_t)ph[2]) << 8) | ph[3]; - - int length = (length_4bytes + 1) * 4; - - if (length > nb_unprotected_buf) { - return srs_error_new(ERROR_RTC_RTCP, "invalid rtcp packet, length=%u", length); - } - - srs_verbose("on rtcp, payload_type=%u", payload_type); - - switch (payload_type) { - case kSR: { - err = on_rtcp_sender_report(ph, length); - break; - } - case kRR: { - err = on_rtcp_receiver_report(ph, length); - break; - } - case kSDES: { - break; - } - case kBye: { - break; - } - case kApp: { - break; - } - case kRtpFb: { - err = on_rtcp_feedback(ph, length); - break; - } - case kPsFb: { - err = on_rtcp_ps_feedback(ph, length); - break; - } - case kXR: { - err = on_rtcp_xr(ph, length); - break; - } - default:{ - return srs_error_new(ERROR_RTC_RTCP_CHECK, "unknown rtcp type=%u", payload_type); - break; - } - } - - if (err != srs_success) { - return srs_error_wrap(err, "rtcp"); - } - - ph += length; - nb_left -= length; - } - - return err; -} - -srs_error_t SrsRtcSession::on_rtp(char* data, int nb_data) -{ - srs_error_t err = srs_success; - - if (publisher == NULL) { - return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); - } - - if (dtls_session == NULL) { - return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); - } - - char* unprotected_buf = new char[kRtpPacketSize]; - int nb_unprotected_buf = nb_data; - if ((err = dtls_session->unprotect_rtp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { - return srs_error_wrap(err, "rtp unprotect failed"); - } - - if (blackhole && blackhole_addr && blackhole_stfd) { - // Ignore any error for black-hole. - void* p = unprotected_buf; int len = nb_unprotected_buf; - srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); - } - - return publisher->on_rtp(unprotected_buf, nb_unprotected_buf); -} - -void SrsRtcSession::update_sendonly_socket(SrsUdpMuxSocket* skt) -{ - if (sendonly_skt) { - srs_trace("session %s address changed, update %s -> %s", - id().c_str(), sendonly_skt->get_peer_id().c_str(), skt->get_peer_id().c_str()); - } - - srs_freep(sendonly_skt); - sendonly_skt = skt->copy_sendonly(); -} - SrsUdpMuxSender::SrsUdpMuxSender(SrsRtcServer* s) { lfd = NULL; @@ -3161,6 +3276,7 @@ srs_error_t SrsRtcServer::on_udp_packet(SrsUdpMuxSocket* skt) rtc_session->switch_to_context(); } + // For STUN, the peer address may change. if (is_stun((uint8_t*)data, size)) { SrsStunPacket sr; if ((err = sr.decode(data, size)) != srs_success) { @@ -3181,22 +3297,20 @@ srs_error_t SrsRtcServer::on_udp_packet(SrsUdpMuxSocket* skt) } return rtc_session->on_stun(skt, &sr); - } else if (is_dtls((uint8_t*)data, size)) { - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); - } + } + // For DTLS, RTCP or RTP, which does not support peer address changing. + if (rtc_session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); + } + + if (is_dtls((uint8_t*)data, size)) { return rtc_session->on_dtls(data, size); } else if (is_rtp_or_rtcp((uint8_t*)data, size)) { - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); - } - if (is_rtcp((uint8_t*)data, size)) { return rtc_session->on_rtcp(data, size); - } else { - return rtc_session->on_rtp(data, size); } + return rtc_session->on_rtp(data, size); } return srs_error_new(ERROR_RTC_UDP, "unknown udp packet type"); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 927ad78d6..65e959e32 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -54,6 +55,8 @@ class ISrsUdpSender; class SrsRtpQueue; class SrsRtpH264Demuxer; class SrsRtpOpusDemuxer; +class SrsRtpPacket2; +class ISrsCodec; const uint8_t kSR = 200; const uint8_t kRR = 201; @@ -248,7 +251,7 @@ private: srs_error_t package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); }; -class SrsRtcPublisher : virtual public ISrsHourGlass +class SrsRtcPublisher : virtual public ISrsHourGlass, virtual public ISrsRtpPacketDecodeHandler { private: SrsHourGlass* report_timer; @@ -258,7 +261,6 @@ private: uint32_t audio_ssrc; private: SrsRtpH264Demuxer* rtp_h264_demuxer; - SrsRtpOpusDemuxer* rtp_opus_demuxer; SrsRtpQueue* rtp_video_queue; SrsRtpQueue* rtp_audio_queue; private: @@ -283,11 +285,14 @@ private: srs_error_t send_rtcp_fb_pli(uint32_t ssrc); public: srs_error_t on_rtp(char* buf, int nb_buf); + virtual void on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsCodec** ppayload); private: - srs_error_t on_audio(SrsRtpSharedPacket* pkt); - srs_error_t collect_audio_frame(); - srs_error_t on_video(SrsRtpSharedPacket* pkt); - srs_error_t collect_video_frame(); + srs_error_t on_audio(SrsRtpPacket2* pkt); + srs_error_t collect_audio_frames(); + srs_error_t do_collect_audio_frame(SrsRtpPacket2* packet); + srs_error_t on_video(SrsRtpPacket2* pkt); + srs_error_t collect_video_frames(); + srs_error_t do_collect_video_frame(std::vector& packets); public: void request_keyframe(); // interface ISrsHourGlass @@ -334,25 +339,18 @@ public: SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id); virtual ~SrsRtcSession(); public: - SrsSdp* get_local_sdp() { return &local_sdp; } + SrsSdp* get_local_sdp(); void set_local_sdp(const SrsSdp& sdp); - - SrsSdp* get_remote_sdp() { return &remote_sdp; } - void set_remote_sdp(const SrsSdp& sdp) { remote_sdp = sdp; } - - SrsRtcSessionStateType get_session_state() { return session_state; } - void set_session_state(SrsRtcSessionStateType state) { session_state = state; } - - std::string id() const { return peer_id + "_" + username; } - - std::string get_peer_id() const { return peer_id; } - void set_peer_id(const std::string& id) { peer_id = id; } - - void set_encrypt(bool v) { encrypt = v; } - + SrsSdp* get_remote_sdp(); + void set_remote_sdp(const SrsSdp& sdp); + SrsRtcSessionStateType get_session_state(); + void set_session_state(SrsRtcSessionStateType state); + std::string id() const; + std::string get_peer_id() const; + void set_peer_id(const std::string& id); + void set_encrypt(bool v); void switch_to_context(); - int context_id() { return cid; } - + int context_id(); public: srs_error_t initialize(); // The peer address may change, we can identify that by STUN messages. @@ -361,7 +359,6 @@ public: srs_error_t on_rtcp(char* data, int nb_data); srs_error_t on_rtp(char* data, int nb_data); public: - srs_error_t send_client_hello(); srs_error_t on_connection_established(); srs_error_t start_play(); srs_error_t start_publish(); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 99c1dc6b1..ad399ea4a 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -141,8 +141,8 @@ SrsRtpRingBuffer::SrsRtpRingBuffer(size_t capacity) capacity_ = capacity; initialized_ = false; - queue_ = new SrsRtpSharedPacket*[capacity_]; - memset(queue_, 0, sizeof(SrsRtpSharedPacket*) * capacity); + queue_ = new SrsRtpPacket2*[capacity_]; + memset(queue_, 0, sizeof(SrsRtpPacket2*) * capacity); } SrsRtpRingBuffer::~SrsRtpRingBuffer() @@ -150,9 +150,9 @@ SrsRtpRingBuffer::~SrsRtpRingBuffer() srs_freepa(queue_); } -void SrsRtpRingBuffer::set(uint16_t at, SrsRtpSharedPacket* pkt) +void SrsRtpRingBuffer::set(uint16_t at, SrsRtpPacket2* pkt) { - SrsRtpSharedPacket* p = queue_[at % capacity_]; + SrsRtpPacket2* p = queue_[at % capacity_]; if (p) { srs_freep(p); @@ -161,9 +161,11 @@ void SrsRtpRingBuffer::set(uint16_t at, SrsRtpSharedPacket* pkt) queue_[at % capacity_] = pkt; } -void SrsRtpRingBuffer::remove(uint16_t at) +void SrsRtpRingBuffer::reset(uint16_t low, uint16_t high) { - set(at, NULL); + for (uint16_t s = low; s != high; ++s) { + queue_[s % capacity_] = NULL; + } } uint16_t SrsRtpRingBuffer::next_start_of_frame() @@ -173,8 +175,8 @@ uint16_t SrsRtpRingBuffer::next_start_of_frame() } for (uint16_t s = low_ + 1 ; s != high_; ++s) { - SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; - if (pkt && pkt->rtp_payload_header->is_first_packet_of_frame) { + SrsRtpPacket2*& pkt = queue_[s % capacity_]; + if (pkt && pkt->is_first_packet_of_frame) { return s; } } @@ -189,8 +191,8 @@ uint16_t SrsRtpRingBuffer::next_keyframe() } for (uint16_t s = low_ + 1 ; s != high_; ++s) { - SrsRtpSharedPacket*& pkt = queue_[s % capacity_]; - if (pkt && pkt->rtp_payload_header->is_key_frame && pkt->rtp_payload_header->is_first_packet_of_frame) { + SrsRtpPacket2*& pkt = queue_[s % capacity_]; + if (pkt && pkt->is_key_frame && pkt->is_first_packet_of_frame) { return s; } } @@ -269,7 +271,7 @@ SrsRtpQueue::~SrsRtpQueue() srs_freep(nack_); } -srs_error_t SrsRtpQueue::consume(SrsRtpSharedPacket* pkt) +srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) { srs_error_t err = srs_success; @@ -337,8 +339,8 @@ srs_error_t SrsRtpQueue::consume(SrsRtpSharedPacket* pkt) queue_->advance_to(next + 1); } - // TODO: FIXME: Change to ptr of ptr. - queue_->set(seq, pkt->copy()); + // Save packet at the position seq. + queue_->set(seq, pkt); // Collect packets to frame when: // 1. Marker bit means the last packet of frame received. @@ -351,7 +353,7 @@ srs_error_t SrsRtpQueue::consume(SrsRtpSharedPacket* pkt) return err; } -void SrsRtpQueue::collect_frames(std::vector >& frames) +void SrsRtpQueue::collect_frames(std::vector >& frames) { frames.swap(frames_); } @@ -446,33 +448,39 @@ void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) void SrsRtpQueue::collect_packet() { - vector frame; - for (uint16_t s = queue_->low(); s != queue_->high(); ++s) { - SrsRtpSharedPacket* pkt = queue_->at(s); + while (queue_->low() != queue_->high()) { + vector frame; + for (uint16_t s = queue_->low(); s != queue_->high(); ++s) { + SrsRtpPacket2* pkt = queue_->at(s); - if (nack_->find(s) != NULL) { - srs_verbose("seq=%u, found in nack list when collect frame", s); - break; - } + // In NACK, never collect frame. + if (nack_->find(s) != NULL) { + srs_verbose("seq=%u, found in nack list when collect frame", s); + return; + } - // We must collect frame from first packet to last packet. - if (s == queue_->low() && pkt->rtp_payload_size() != 0 && !pkt->rtp_payload_header->is_first_packet_of_frame) { - break; - } + // Ignore when the first packet not the start. + if (s == queue_->low() && pkt->nn_original_payload && !pkt->is_first_packet_of_frame) { + return; + } - frame.push_back(pkt->copy()); - if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { + // OK, collect packet to frame. + frame.push_back(pkt); + + // Not the last packet, continue to process next one. + if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { + continue; + } + + // Done, we got the last packet of frame. nn_collected_frames++; frames_.push_back(frame); - frame.clear(); + + // Reset the range of packets to NULL in buffer. + queue_->reset(queue_->low(), s); srs_verbose("head seq=%u, update to %u because collect one full farme", queue_->low(), s + 1); queue_->advance_to(s + 1); } } - - // remove the tmp buffer - for (size_t i = 0; i < frame.size(); ++i) { - srs_freep(frame[i]); - } } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 33c1d3057..2e948d88e 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -30,7 +30,7 @@ #include #include -class SrsRtpSharedPacket; +class SrsRtpPacket2; class SrsRtpQueue; struct SrsNackOption @@ -119,7 +119,7 @@ private: // Capacity of the ring-buffer. uint16_t capacity_; // Ring bufer. - SrsRtpSharedPacket** queue_; + SrsRtpPacket2** queue_; // Increase one when uint16 flip back, for get_extended_highest_sequence. uint64_t nn_seq_flip_backs; // Whether initialized, because we use uint16 so we can't use -1. @@ -132,12 +132,17 @@ public: SrsRtpRingBuffer(size_t capacity); virtual ~SrsRtpRingBuffer(); public: + // Move the position of buffer. uint16_t low() { return low_; } uint16_t high() { return high_; } void advance_to(uint16_t seq) { low_ = seq; } - void set(uint16_t at, SrsRtpSharedPacket* pkt); - void remove(uint16_t at); - bool overflow() { return low_ + capacity_ < high_; } + // Free the packet at position. + void set(uint16_t at, SrsRtpPacket2* pkt); + void remove(uint16_t at) { set(at, NULL); } + // Directly reset range [low, high] to NULL. + void reset(uint16_t low, uint16_t high); + // Whether queue overflow or heavy(too many packets and need clear). + bool overflow() { return high_ - low_ < capacity_; } bool is_heavy() { return high_ - low_ >= capacity_ / 2; } // Get the next start packet of frame. // @remark If not found, return the low_, which should never be the "next" one, @@ -151,7 +156,7 @@ public: // Update the sequence, got the nack range by [low, high]. void update(uint16_t seq, bool startup, uint16_t& nack_low, uint16_t& nack_high); // Get the packet by seq. - SrsRtpSharedPacket* at(uint16_t seq) { return queue_[seq % capacity_]; } + SrsRtpPacket2* at(uint16_t seq) { return queue_[seq % capacity_]; } }; class SrsRtpQueue @@ -170,14 +175,14 @@ private: uint64_t num_of_packet_received_; uint64_t number_of_packet_lossed_; private: - std::vector > frames_; + std::vector > frames_; bool request_key_frame_; public: SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); virtual ~SrsRtpQueue(); public: - srs_error_t consume(SrsRtpSharedPacket* pkt); - void collect_frames(std::vector >& frames); + srs_error_t consume(SrsRtpPacket2* pkt); + void collect_frames(std::vector >& frames); bool should_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index 7f62d6b5a..ced0f776e 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -58,11 +58,26 @@ SrsBuffer::~SrsBuffer() { } +char* SrsBuffer::data() +{ + return bytes; +} + +char* SrsBuffer::head() +{ + return p; +} + int SrsBuffer::size() { return nb_bytes; } +void SrsBuffer::set_size(int v) +{ + nb_bytes = v; +} + int SrsBuffer::pos() { return (int)(p - bytes); diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index ce8852c87..f2f73bf70 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -105,62 +105,62 @@ public: // Create buffer with data b and size nn. // @remark User must free the data b. SrsBuffer(char* b, int nn); - virtual ~SrsBuffer(); + ~SrsBuffer(); public: // Get the data and head of buffer. // current-bytes = head() = data() + pos() - inline char* data() { return bytes; } - inline char* head() { return p; } + char* data(); + char* head(); // Get the total size of buffer. // left-bytes = size() - pos() - virtual int size(); - void set_size(int v) { nb_bytes = v; } + int size(); + void set_size(int v); // Get the current buffer position. - virtual int pos(); + int pos(); // Left bytes in buffer, total size() minus the current pos(). - virtual int left(); + int left(); // Whether buffer is empty. - virtual bool empty(); + bool empty(); // Whether buffer is able to supply required size of bytes. // @remark User should check buffer by require then do read/write. // @remark Assert the required_size is not negative. - virtual bool require(int required_size); + bool require(int required_size); public: // Skip some size. // @param size can be any value. positive to forward; nagetive to backward. // @remark to skip(pos()) to reset buffer. // @remark assert initialized, the data() not NULL. - virtual void skip(int size); + void skip(int size); public: // Read 1bytes char from buffer. - virtual int8_t read_1bytes(); + int8_t read_1bytes(); // Read 2bytes int from buffer. - virtual int16_t read_2bytes(); + int16_t read_2bytes(); // Read 3bytes int from buffer. - virtual int32_t read_3bytes(); + int32_t read_3bytes(); // Read 4bytes int from buffer. - virtual int32_t read_4bytes(); + int32_t read_4bytes(); // Read 8bytes int from buffer. - virtual int64_t read_8bytes(); + int64_t read_8bytes(); // Read string from buffer, length specifies by param len. - virtual std::string read_string(int len); + std::string read_string(int len); // Read bytes from buffer, length specifies by param len. - virtual void read_bytes(char* data, int size); + void read_bytes(char* data, int size); public: // Write 1bytes char to buffer. - virtual void write_1bytes(int8_t value); + void write_1bytes(int8_t value); // Write 2bytes int to buffer. - virtual void write_2bytes(int16_t value); + void write_2bytes(int16_t value); // Write 4bytes int to buffer. - virtual void write_4bytes(int32_t value); + void write_4bytes(int32_t value); // Write 3bytes int to buffer. - virtual void write_3bytes(int32_t value); + void write_3bytes(int32_t value); // Write 8bytes int to buffer. - virtual void write_8bytes(int64_t value); + void write_8bytes(int64_t value); // Write string to buffer - virtual void write_string(std::string value); + void write_string(std::string value); // Write bytes to buffer - virtual void write_bytes(char* data, int size); + void write_bytes(char* data, int size); }; /** @@ -175,10 +175,10 @@ private: SrsBuffer* stream; public: SrsBitBuffer(SrsBuffer* b); - virtual ~SrsBitBuffer(); + ~SrsBitBuffer(); public: - virtual bool empty(); - virtual int8_t read_bit(); + bool empty(); + int8_t read_bit(); }; #endif diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp index 594f5598e..f10bb608a 100644 --- a/trunk/src/kernel/srs_kernel_flv.cpp +++ b/trunk/src/kernel/srs_kernel_flv.cpp @@ -388,6 +388,36 @@ void SrsSharedPtrMessage::set_extra_payloads(SrsSample* payloads, int nn_payload memcpy((void*)ptr->extra_payloads, payloads, nn_payloads * sizeof(SrsSample)); } +int SrsSharedPtrMessage::nn_extra_payloads() +{ + return ptr->nn_extra_payloads; +} + +SrsSample* SrsSharedPtrMessage::extra_payloads() +{ + return ptr->extra_payloads; +} + +void SrsSharedPtrMessage::set_max_extra_payload(int v) +{ + ptr->nn_max_extra_payloads = v; +} + +int SrsSharedPtrMessage::nn_max_extra_payloads() +{ + return ptr->nn_max_extra_payloads; +} + +bool SrsSharedPtrMessage::has_idr() +{ + return ptr->has_idr; +} + +void SrsSharedPtrMessage::set_has_idr(bool v) +{ + ptr->has_idr = v; +} + void SrsSharedPtrMessage::set_samples(SrsSample* samples, int nn_samples) { srs_assert(nn_samples); @@ -398,6 +428,16 @@ void SrsSharedPtrMessage::set_samples(SrsSample* samples, int nn_samples) ptr->samples = new SrsSample[nn_samples]; memcpy((void*)ptr->samples, samples, nn_samples * sizeof(SrsSample)); } + +int SrsSharedPtrMessage::nn_samples() +{ + return ptr->nn_samples; +} + +SrsSample* SrsSharedPtrMessage::samples() +{ + return ptr->samples; +} #endif SrsFlvTransmuxer::SrsFlvTransmuxer() diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index 80d3ce542..7545aa5b7 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -367,18 +367,18 @@ public: // Set extra samples, for example, when we transcode an AAC audio packet to OPUS, // we may get more than one OPUS packets, we set these OPUS packets in extra payloads. void set_extra_payloads(SrsSample* payloads, int nn_payloads); - int nn_extra_payloads() { return ptr->nn_extra_payloads; } - SrsSample* extra_payloads() { return ptr->extra_payloads; } + int nn_extra_payloads(); + SrsSample* extra_payloads(); // The max extra payload size. - void set_max_extra_payload(int v) { ptr->nn_max_extra_payloads = v; } - int nn_max_extra_payloads() { return ptr->nn_max_extra_payloads; } + void set_max_extra_payload(int v); + int nn_max_extra_payloads(); // Whether samples has idr. - bool has_idr() { return ptr->has_idr; } - void set_has_idr(bool v) { ptr->has_idr = v; } + bool has_idr(); + void set_has_idr(bool v); // Set samples, each sample points to the address of payload. void set_samples(SrsSample* samples, int nn_samples); - int nn_samples() { return ptr->nn_samples; } - SrsSample* samples() { return ptr->samples; } + int nn_samples(); + SrsSample* samples(); #endif }; diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index fda53ef63..105f75a43 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -61,11 +61,11 @@ SrsRtpHeader::~SrsRtpHeader() { } -srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) +srs_error_t SrsRtpHeader::decode(SrsBuffer* buf) { srs_error_t err = srs_success; - if (stream->size() < kRtpHeaderFixedSize) { + if (buf->size() < kRtpHeaderFixedSize) { return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); } @@ -84,60 +84,58 @@ srs_error_t SrsRtpHeader::decode(SrsBuffer* stream) +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ - uint8_t first = stream->read_1bytes(); + uint8_t first = buf->read_1bytes(); padding = (first & 0x20); extension = (first & 0x10); cc = (first & 0x0F); - uint8_t second = stream->read_1bytes(); + uint8_t second = buf->read_1bytes(); marker = (second & 0x80); payload_type = (second & 0x7F); - sequence = stream->read_2bytes(); - timestamp = stream->read_4bytes(); - ssrc = stream->read_4bytes(); + sequence = buf->read_2bytes(); + timestamp = buf->read_4bytes(); + ssrc = buf->read_4bytes(); - if ((size_t)stream->size() < header_size()) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); + if (!buf->require(nb_bytes())) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d+ bytes", nb_bytes()); } for (uint8_t i = 0; i < cc; ++i) { - csrc[i] = stream->read_4bytes(); + csrc[i] = buf->read_4bytes(); } if (extension) { - // TODO: - uint16_t profile_id = stream->read_2bytes(); - extension_length = stream->read_2bytes(); - // @see: https://tools.ietf.org/html/rfc3550#section-5.3.1 - stream->skip(extension_length * 4); + uint16_t profile_id = buf->read_2bytes(); + extension_length = buf->read_2bytes(); - srs_verbose("extension, profile_id=%u, length=%u", profile_id, extension_length); + // TODO: FIXME: Read extensions. + // @see: https://tools.ietf.org/html/rfc3550#section-5.3.1 + buf->skip(extension_length * 4); // @see: https://tools.ietf.org/html/rfc5285#section-4.2 if (profile_id == 0xBEDE) { + // TODO: FIXME: Implements it. } } if (padding) { - padding_length = *(reinterpret_cast(stream->data() + stream->size() - 1)); - if (padding_length > (stream->size() - stream->pos())) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); + padding_length = *(reinterpret_cast(buf->data() + buf->size() - 1)); + if (!buf->require(padding_length)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "padding requires %d bytes", padding_length); } - - srs_verbose("offset=%d, padding_length=%u", stream->size(), padding_length); } return err; } -srs_error_t SrsRtpHeader::encode(SrsBuffer* stream) +srs_error_t SrsRtpHeader::encode(SrsBuffer* buf) { srs_error_t err = srs_success; // Encode the RTP fix header, 12bytes. // @see https://tools.ietf.org/html/rfc1889#section-5.1 - char* op = stream->head(); + char* op = buf->head(); char* p = op; // The version, padding, extension and cc, total 1 byte. @@ -190,24 +188,42 @@ srs_error_t SrsRtpHeader::encode(SrsBuffer* stream) } // Consume the data. - stream->skip(p - op); + buf->skip(p - op); return err; } -size_t SrsRtpHeader::header_size() +int SrsRtpHeader::nb_bytes() { return kRtpHeaderFixedSize + cc * 4 + (extension ? (extension_length + 1) * 4 : 0); } +ISrsRtpPacketDecodeHandler::ISrsRtpPacketDecodeHandler() +{ +} + +ISrsRtpPacketDecodeHandler::~ISrsRtpPacketDecodeHandler() +{ +} + SrsRtpPacket2::SrsRtpPacket2() { - payload = NULL; padding = 0; + payload = NULL; + decode_handler = NULL; + + is_first_packet_of_frame = false; + is_last_packet_of_frame = false; + is_key_frame = false; + nalu_type = SrsAvcNaluTypeReserved; cache_raw = new SrsRtpRawPayload(); cache_fua = new SrsRtpFUAPayload2(); cache_payload = 0; + + original_bytes = NULL; + nn_original_bytes = 0; + nn_original_payload = 0; } SrsRtpPacket2::~SrsRtpPacket2() @@ -220,6 +236,8 @@ SrsRtpPacket2::~SrsRtpPacket2() srs_freep(payload); srs_freep(cache_raw); srs_freep(cache_fua); + + srs_freepa(original_bytes); } void SrsRtpPacket2::set_padding(int size) @@ -270,7 +288,7 @@ SrsRtpFUAPayload2* SrsRtpPacket2::reuse_fua() int SrsRtpPacket2::nb_bytes() { if (!cache_payload) { - cache_payload = rtp_header.header_size() + (payload? payload->nb_bytes():0) + padding; + cache_payload = rtp_header.nb_bytes() + (payload? payload->nb_bytes():0) + padding; } return cache_payload; } @@ -284,7 +302,7 @@ srs_error_t SrsRtpPacket2::encode(SrsBuffer* buf) } if (payload && (err = payload->encode(buf)) != srs_success) { - return srs_error_wrap(err, "encode payload"); + return srs_error_wrap(err, "rtp payload"); } if (padding > 0) { @@ -298,6 +316,44 @@ srs_error_t SrsRtpPacket2::encode(SrsBuffer* buf) return err; } +srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf) +{ + srs_error_t err = srs_success; + + if ((err = rtp_header.decode(buf)) != srs_success) { + return srs_error_wrap(err, "rtp header"); + } + + // We must skip the padding bytes before parsing payload. + padding = rtp_header.get_padding_length(); + if (!buf->require(padding)) { + return srs_error_wrap(err, "requires padding %d bytes", padding); + } + buf->set_size(buf->size() - padding); + + // Try to parse the NALU type for video decoder. + if (!buf->empty()) { + nalu_type = SrsAvcNaluType((uint8_t)(buf->head()[0] & 0x3f)); + } + + // If user set the decode handler, call it to set the payload. + if (decode_handler) { + decode_handler->on_before_decode_payload(this, buf, &payload); + nn_original_payload = buf->left(); + } + + // By default, we always use the RAW payload. + if (!payload) { + payload = reuse_raw(); + } + + if ((err = payload->decode(buf)) != srs_success) { + return srs_error_wrap(err, "rtp payload"); + } + + return err; +} + SrsRtpRawPayload::SrsRtpRawPayload() { payload = NULL; @@ -328,6 +384,18 @@ srs_error_t SrsRtpRawPayload::encode(SrsBuffer* buf) return srs_success; } +srs_error_t SrsRtpRawPayload::decode(SrsBuffer* buf) +{ + if (buf->empty()) { + return srs_success; + } + + payload = buf->head(); + nn_payload = buf->left(); + + return srs_success; +} + SrsRtpRawNALUs::SrsRtpRawNALUs() { cursor = 0; @@ -336,12 +404,10 @@ SrsRtpRawNALUs::SrsRtpRawNALUs() SrsRtpRawNALUs::~SrsRtpRawNALUs() { - if (true) { - int nn_nalus = (int)nalus.size(); - for (int i = 0; i < nn_nalus; i++) { - SrsSample* p = nalus[i]; - srs_freep(p); - } + int nn_nalus = (int)nalus.size(); + for (int i = 0; i < nn_nalus; i++) { + SrsSample* p = nalus[i]; + srs_freep(p); } } @@ -436,6 +502,22 @@ srs_error_t SrsRtpRawNALUs::encode(SrsBuffer* buf) return srs_success; } +srs_error_t SrsRtpRawNALUs::decode(SrsBuffer* buf) +{ + if (buf->empty()) { + return srs_success; + } + + SrsSample* sample = new SrsSample(); + sample->bytes = buf->head(); + sample->size = buf->left(); + buf->skip(sample->size); + + nalus.push_back(sample); + + return srs_success; +} + SrsRtpSTAPPayload::SrsRtpSTAPPayload() { nri = (SrsAvcNaluType)0; @@ -491,6 +573,39 @@ srs_error_t SrsRtpSTAPPayload::encode(SrsBuffer* buf) return srs_success; } +srs_error_t SrsRtpSTAPPayload::decode(SrsBuffer* buf) +{ + if (!buf->require(1)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 1); + } + + // STAP header, RTP payload format for aggregation packets + // @see https://tools.ietf.org/html/rfc6184#section-5.7 + uint8_t v = buf->read_1bytes(); + nri = SrsAvcNaluType(v & kNalTypeMask); + + // NALUs. + while (!buf->empty()) { + if (!buf->require(2)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 2); + } + + int size = buf->read_2bytes(); + if (!buf->require(size)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", size); + } + + SrsSample* sample = new SrsSample(); + sample->bytes = buf->head(); + sample->size = size; + buf->skip(size); + + nalus.push_back(sample); + } + + return srs_success; +} + SrsRtpFUAPayload::SrsRtpFUAPayload() { start = end = false; @@ -555,6 +670,36 @@ srs_error_t SrsRtpFUAPayload::encode(SrsBuffer* buf) return srs_success; } +srs_error_t SrsRtpFUAPayload::decode(SrsBuffer* buf) +{ + if (!buf->require(2)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 2); + } + + // FU indicator, @see https://tools.ietf.org/html/rfc6184#section-5.8 + uint8_t v = buf->read_1bytes(); + nri = SrsAvcNaluType(v & kNalTypeMask); + + // FU header, @see https://tools.ietf.org/html/rfc6184#section-5.8 + v = buf->read_1bytes(); + start = v & kStart; + end = v & kEnd; + nalu_type = SrsAvcNaluType(v & 0x3f); + + if (!buf->require(1)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 1); + } + + SrsSample* sample = new SrsSample(); + sample->bytes = buf->head(); + sample->size = buf->left(); + buf->skip(sample->size); + + nalus.push_back(sample); + + return srs_success; +} + SrsRtpFUAPayload2::SrsRtpFUAPayload2() { start = end = false; @@ -606,6 +751,33 @@ srs_error_t SrsRtpFUAPayload2::encode(SrsBuffer* buf) return srs_success; } +srs_error_t SrsRtpFUAPayload2::decode(SrsBuffer* buf) +{ + if (!buf->require(2)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 2); + } + + // FU indicator, @see https://tools.ietf.org/html/rfc6184#section-5.8 + uint8_t v = buf->read_1bytes(); + nri = SrsAvcNaluType(v & (~kNalTypeMask)); + + // FU header, @see https://tools.ietf.org/html/rfc6184#section-5.8 + v = buf->read_1bytes(); + start = v & kStart; + end = v & kEnd; + nalu_type = SrsAvcNaluType(v & 0x3f); + + if (!buf->require(1)) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 1); + } + + payload = buf->head(); + size = buf->left(); + buf->skip(size); + + return srs_success; +} + SrsRtpPayloadHeader::SrsRtpPayloadHeader() { is_first_packet_of_frame = false; @@ -721,7 +893,7 @@ srs_error_t SrsRtpSharedPacket::create(SrsRtpHeader* rtp_h, SrsRtpPayloadHeader* this->rtp_payload_header = rtp_ph; // TODO: rtp header padding. - size_t buffer_size = rtp_header.header_size() + s; + int buffer_size = rtp_header.nb_bytes() + s; char* buffer = new char[buffer_size]; SrsBuffer stream(buffer, buffer_size); diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index 42fda10c0..d97abdb6e 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -31,6 +31,8 @@ #include +class SrsRtpPacket2; + const int kRtpHeaderFixedSize = 12; const uint8_t kRtpMarker = 0x80; @@ -72,10 +74,9 @@ public: virtual ~SrsRtpHeader(); void reset(); public: - srs_error_t decode(SrsBuffer* stream); - srs_error_t encode(SrsBuffer* stream); -public: - size_t header_size(); + virtual srs_error_t decode(SrsBuffer* buf); + virtual srs_error_t encode(SrsBuffer* buf); + virtual int nb_bytes(); public: inline void set_marker(bool v) { marker = v; } bool get_marker() const { return marker; } @@ -92,16 +93,48 @@ public: uint8_t get_padding_length() const { return padding_length; } }; -class SrsRtpPacket2 +class ISrsRtpPacketDecodeHandler { public: + ISrsRtpPacketDecodeHandler(); + virtual ~ISrsRtpPacketDecodeHandler(); +public: + // We don't know the actual payload, so we depends on external handler. + virtual void on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsCodec** ppayload) = 0; +}; + +class SrsRtpPacket2 +{ +// RTP packet fields. +public: + // TODO: FIXME: Rename to header. SrsRtpHeader rtp_header; - ISrsEncoder* payload; + ISrsCodec* payload; + // TODO: FIXME: Merge into rtp_header. int padding; +// Decoder helper. +public: + // Helper information for decoder. + bool is_first_packet_of_frame; + bool is_last_packet_of_frame; + bool is_key_frame; + // The first byte as nalu type, for video decoder only. + SrsAvcNaluType nalu_type; + // The original payload bytes length. + int nn_original_payload; +// Decoder helper. private: + // The original bytes for decoder only, we will free it. + char* original_bytes; + int nn_original_bytes; +// Fast cache for performance. +private: + // Cache frequently used payload for performance. SrsRtpRawPayload* cache_raw; SrsRtpFUAPayload2* cache_fua; int cache_payload; + // The helper handler for decoder, use RAW payload if NULL. + ISrsRtpPacketDecodeHandler* decode_handler; public: SrsRtpPacket2(); virtual ~SrsRtpPacket2(); @@ -116,14 +149,19 @@ public: SrsRtpRawPayload* reuse_raw(); // Reuse the cached fua message as payload. SrsRtpFUAPayload2* reuse_fua(); + // Set the decode handler. + void set_decode_handler(ISrsRtpPacketDecodeHandler* h) { decode_handler = h; } + // Set the original bytes. + void set_original_bytes(char* buf, int nn_buf) { original_bytes = buf; nn_original_bytes = nn_buf; } // interface ISrsEncoder public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; // Single payload data. -class SrsRtpRawPayload : public ISrsEncoder +class SrsRtpRawPayload : public ISrsCodec { public: // The RAW payload, directly point to the shared memory. @@ -137,10 +175,11 @@ public: public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; // Multiple NALUs, automatically insert 001 between NALUs. -class SrsRtpRawNALUs : public ISrsEncoder +class SrsRtpRawNALUs : public ISrsCodec { private: // We will manage the samples, but the sample itself point to the shared memory. @@ -160,10 +199,11 @@ public: public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; // STAP-A, for multiple NALUs. -class SrsRtpSTAPPayload : public ISrsEncoder +class SrsRtpSTAPPayload : public ISrsCodec { public: // The NRI in NALU type. @@ -178,11 +218,12 @@ public: public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; // FU-A, for one NALU with multiple fragments. // With more than one payload. -class SrsRtpFUAPayload : public ISrsEncoder +class SrsRtpFUAPayload : public ISrsCodec { public: // The NRI in NALU type. @@ -201,11 +242,12 @@ public: public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; // FU-A, for one NALU with multiple fragments. // With only one payload. -class SrsRtpFUAPayload2 : public ISrsEncoder +class SrsRtpFUAPayload2 : public ISrsCodec { public: // The NRI in NALU type. @@ -224,6 +266,7 @@ public: public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); + virtual srs_error_t decode(SrsBuffer* buf); }; class SrsRtpPayloadHeader @@ -290,8 +333,8 @@ public: srs_error_t decode(char* buf, int nb_buf); SrsRtpSharedPacket* copy(); public: - char* rtp_payload() { return payload + rtp_header.header_size(); } - int rtp_payload_size() { return size - rtp_header.header_size() - rtp_header.get_padding_length(); } + char* rtp_payload() { return payload + rtp_header.nb_bytes(); } + int rtp_payload_size() { return size - rtp_header.nb_bytes() - rtp_header.get_padding_length(); } // Interface to modify rtp header public: srs_error_t modify_rtp_header_marker(bool marker); From b3a0284db51373e01c2caa27d56ef4d5a2302ecf Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 09:48:04 +0800 Subject: [PATCH 34/79] Refactor code to split implementation to cpp --- trunk/src/app/srs_app_dtls.cpp | 27 +++++--- trunk/src/app/srs_app_dtls.hpp | 4 +- trunk/src/app/srs_app_listener.cpp | 59 +++++++++++++----- trunk/src/app/srs_app_listener.hpp | 19 ++---- trunk/src/app/srs_app_rtc_conn.cpp | 45 ++++++++------ trunk/src/app/srs_app_rtc_conn.hpp | 2 +- trunk/src/app/srs_app_rtp_queue.cpp | 49 ++++++++++++++- trunk/src/app/srs_app_rtp_queue.hpp | 16 ++--- trunk/src/app/srs_app_source.cpp | 10 +++ trunk/src/app/srs_app_source.hpp | 4 +- trunk/src/kernel/srs_kernel_rtp.cpp | 76 ++++++++++++++++++++++ trunk/src/kernel/srs_kernel_rtp.hpp | 31 ++++----- trunk/src/protocol/srs_stun_stack.cpp | 90 +++++++++++++++++++++++++++ trunk/src/protocol/srs_stun_stack.hpp | 41 ++++++------ 14 files changed, 363 insertions(+), 110 deletions(-) diff --git a/trunk/src/app/srs_app_dtls.cpp b/trunk/src/app/srs_app_dtls.cpp index 5ecac847f..2eb32ef6e 100644 --- a/trunk/src/app/srs_app_dtls.cpp +++ b/trunk/src/app/srs_app_dtls.cpp @@ -46,14 +46,6 @@ SrsDtls::~SrsDtls() SSL_CTX_free(dtls_ctx); } -SrsDtls* SrsDtls::instance() -{ - if (!_instance) { - _instance = new SrsDtls(); - } - return _instance; -} - // The return value of verify_callback controls the strategy of the further verification process. If verify_callback // returns 0, the verification process is immediately stopped with "verification failed" state. If SSL_VERIFY_PEER is // set, a verification failure alert is sent to the peer and the TLS/SSL handshake is terminated. If verify_callback @@ -256,3 +248,22 @@ srs_error_t SrsDtls::init(SrsRequest* r) return err; } + +SrsDtls* SrsDtls::instance() +{ + if (!_instance) { + _instance = new SrsDtls(); + } + return _instance; +} + +SSL_CTX* SrsDtls::get_dtls_ctx() +{ + return dtls_ctx; +} + +std::string SrsDtls::get_fingerprint() const +{ + return fingerprint; +} + diff --git a/trunk/src/app/srs_app_dtls.hpp b/trunk/src/app/srs_app_dtls.hpp index 560386f77..25cc80b4c 100644 --- a/trunk/src/app/srs_app_dtls.hpp +++ b/trunk/src/app/srs_app_dtls.hpp @@ -46,9 +46,9 @@ public: srs_error_t init(SrsRequest* r); public: static SrsDtls* instance(); - SSL_CTX* get_dtls_ctx() { return dtls_ctx; } + SSL_CTX* get_dtls_ctx(); public: - std::string get_fingerprint() const { return fingerprint; } + std::string get_fingerprint() const; }; #endif diff --git a/trunk/src/app/srs_app_listener.cpp b/trunk/src/app/srs_app_listener.cpp index 72d62fffe..b5fab94bd 100755 --- a/trunk/src/app/srs_app_listener.cpp +++ b/trunk/src/app/srs_app_listener.cpp @@ -261,23 +261,6 @@ SrsUdpMuxSocket::~SrsUdpMuxSocket() srs_freepa(buf); } -SrsUdpMuxSocket* SrsUdpMuxSocket::copy_sendonly() -{ - SrsUdpMuxSocket* sendonly = new SrsUdpMuxSocket(handler, lfd); - - // Don't copy buffer - srs_freepa(sendonly->buf); - sendonly->nb_buf = 0; - sendonly->nread = 0; - sendonly->lfd = lfd; - sendonly->from = from; - sendonly->fromlen = fromlen; - sendonly->peer_ip = peer_ip; - sendonly->peer_port = peer_port; - - return sendonly; -} - int SrsUdpMuxSocket::recvfrom(srs_utime_t timeout) { fromlen = sizeof(from); @@ -341,6 +324,26 @@ socklen_t SrsUdpMuxSocket::peer_addrlen() return (socklen_t)fromlen; } +char* SrsUdpMuxSocket::data() +{ + return buf; +} + +int SrsUdpMuxSocket::size() +{ + return nread; +} + +std::string SrsUdpMuxSocket::get_peer_ip() const +{ + return peer_ip; +} + +int SrsUdpMuxSocket::get_peer_port() const +{ + return peer_port; +} + std::string SrsUdpMuxSocket::get_peer_id() { char id_buf[1024]; @@ -349,6 +352,28 @@ std::string SrsUdpMuxSocket::get_peer_id() return string(id_buf, len); } +SrsUdpMuxSocket* SrsUdpMuxSocket::copy_sendonly() +{ + SrsUdpMuxSocket* sendonly = new SrsUdpMuxSocket(handler, lfd); + + // Don't copy buffer + srs_freepa(sendonly->buf); + sendonly->nb_buf = 0; + sendonly->nread = 0; + sendonly->lfd = lfd; + sendonly->from = from; + sendonly->fromlen = fromlen; + sendonly->peer_ip = peer_ip; + sendonly->peer_port = peer_port; + + return sendonly; +} + +ISrsUdpSender* SrsUdpMuxSocket::sender() +{ + return handler; +} + SrsUdpMuxListener::SrsUdpMuxListener(ISrsUdpMuxHandler* h, ISrsUdpSender* s, std::string i, int p) { handler = h; diff --git a/trunk/src/app/srs_app_listener.hpp b/trunk/src/app/srs_app_listener.hpp index cc20cc756..46fd11a7e 100644 --- a/trunk/src/app/srs_app_listener.hpp +++ b/trunk/src/app/srs_app_listener.hpp @@ -163,26 +163,19 @@ private: public: SrsUdpMuxSocket(ISrsUdpSender* h, srs_netfd_t fd); virtual ~SrsUdpMuxSocket(); - +public: int recvfrom(srs_utime_t timeout); srs_error_t sendto(void* data, int size, srs_utime_t timeout); - srs_netfd_t stfd(); sockaddr_in* peer_addr(); socklen_t peer_addrlen(); - - char* data() { return buf; } - int size() { return nread; } - std::string get_peer_ip() const { return peer_ip; } - int get_peer_port() const { return peer_port; } + char* data(); + int size(); + std::string get_peer_ip() const; + int get_peer_port() const; std::string get_peer_id(); -public: SrsUdpMuxSocket* copy_sendonly(); - ISrsUdpSender* sender() { return handler; }; -private: - // Don't allow copy, user copy_sendonly instead - SrsUdpMuxSocket(const SrsUdpMuxSocket& rhs); - SrsUdpMuxSocket& operator=(const SrsUdpMuxSocket& rhs); + ISrsUdpSender* sender(); }; class SrsUdpMuxListener : public ISrsCoroutineHandler diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 686ccbb88..177e070aa 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -3396,26 +3396,6 @@ srs_error_t SrsRtcServer::create_rtc_session( return err; } -SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) -{ - map::iterator iter = map_id_session.find(peer_id); - if (iter == map_id_session.end()) { - return NULL; - } - - return iter->second; -} - -SrsRtcSession* SrsRtcServer::find_rtc_session_by_username(const std::string& username) -{ - map::iterator iter = map_username_session.find(username); - if (iter == map_username_session.end()) { - return NULL; - } - - return iter->second; -} - bool SrsRtcServer::insert_into_id_sessions(const string& peer_id, SrsRtcSession* rtc_session) { return map_id_session.insert(make_pair(peer_id, rtc_session)).second; @@ -3447,6 +3427,31 @@ void SrsRtcServer::check_and_clean_timeout_session() } } +int SrsRtcServer::nn_sessions() +{ + return (int)map_username_session.size(); +} + +SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) +{ + map::iterator iter = map_id_session.find(peer_id); + if (iter == map_id_session.end()) { + return NULL; + } + + return iter->second; +} + +SrsRtcSession* SrsRtcServer::find_rtc_session_by_username(const std::string& username) +{ + map::iterator iter = map_username_session.find(username); + if (iter == map_username_session.end()) { + return NULL; + } + + return iter->second; +} + srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tick) { check_and_clean_timeout_session(); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 65e959e32..a5598e28f 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -444,7 +444,7 @@ public: ); bool insert_into_id_sessions(const std::string& peer_id, SrsRtcSession* rtc_session); void check_and_clean_timeout_session(); - int nn_sessions() { return (int)map_username_session.size(); } + int nn_sessions(); private: SrsRtcSession* find_rtc_session_by_username(const std::string& ufrag); SrsRtcSession* find_rtc_session_by_peer_id(const std::string& peer_id); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index ad399ea4a..c7f1a0473 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -150,6 +150,21 @@ SrsRtpRingBuffer::~SrsRtpRingBuffer() srs_freepa(queue_); } +uint16_t SrsRtpRingBuffer::low() +{ + return low_; +} + +uint16_t SrsRtpRingBuffer::high() +{ + return high_; +} + +void SrsRtpRingBuffer::advance_to(uint16_t seq) +{ + low_ = seq; +} + void SrsRtpRingBuffer::set(uint16_t at, SrsRtpPacket2* pkt) { SrsRtpPacket2* p = queue_[at % capacity_]; @@ -161,6 +176,11 @@ void SrsRtpRingBuffer::set(uint16_t at, SrsRtpPacket2* pkt) queue_[at % capacity_] = pkt; } +void SrsRtpRingBuffer::remove(uint16_t at) +{ + set(at, NULL); +} + void SrsRtpRingBuffer::reset(uint16_t low, uint16_t high) { for (uint16_t s = low; s != high; ++s) { @@ -168,6 +188,16 @@ void SrsRtpRingBuffer::reset(uint16_t low, uint16_t high) } } +bool SrsRtpRingBuffer::overflow() +{ + return high_ - low_ < capacity_; +} + +bool SrsRtpRingBuffer::is_heavy() +{ + return high_ - low_ >= capacity_ / 2; +} + uint16_t SrsRtpRingBuffer::next_start_of_frame() { if (low_ == high_) { @@ -245,6 +275,11 @@ void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, ui } } +SrsRtpPacket2* SrsRtpRingBuffer::at(uint16_t seq) +{ + return queue_[seq % capacity_]; +} + SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) { nn_collected_frames = 0; @@ -396,6 +431,11 @@ void SrsRtpQueue::notify_nack_list_full() queue_->advance_to(next + 1); } +void SrsRtpQueue::request_keyframe() +{ + request_key_frame_ = true; +} + uint32_t SrsRtpQueue::get_extended_highest_sequence() { return queue_->get_extended_highest_sequence(); @@ -450,7 +490,9 @@ void SrsRtpQueue::collect_packet() { while (queue_->low() != queue_->high()) { vector frame; - for (uint16_t s = queue_->low(); s != queue_->high(); ++s) { + + uint16_t s = queue_->low(); + for (; s != queue_->high(); ++s) { SrsRtpPacket2* pkt = queue_->at(s); // In NACK, never collect frame. @@ -468,14 +510,17 @@ void SrsRtpQueue::collect_packet() frame.push_back(pkt); // Not the last packet, continue to process next one. - if (pkt->rtp_header.get_marker() || one_packet_per_frame_) { + if (!pkt->rtp_header.get_marker() && !one_packet_per_frame_) { continue; } // Done, we got the last packet of frame. nn_collected_frames++; frames_.push_back(frame); + break; + } + if (queue_->low() != s) { // Reset the range of packets to NULL in buffer. queue_->reset(queue_->low(), s); diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 2e948d88e..523bd9f0f 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -133,17 +133,17 @@ public: virtual ~SrsRtpRingBuffer(); public: // Move the position of buffer. - uint16_t low() { return low_; } - uint16_t high() { return high_; } - void advance_to(uint16_t seq) { low_ = seq; } + uint16_t low(); + uint16_t high(); + void advance_to(uint16_t seq); // Free the packet at position. void set(uint16_t at, SrsRtpPacket2* pkt); - void remove(uint16_t at) { set(at, NULL); } + void remove(uint16_t at); // Directly reset range [low, high] to NULL. void reset(uint16_t low, uint16_t high); // Whether queue overflow or heavy(too many packets and need clear). - bool overflow() { return high_ - low_ < capacity_; } - bool is_heavy() { return high_ - low_ >= capacity_ / 2; } + bool overflow(); + bool is_heavy(); // Get the next start packet of frame. // @remark If not found, return the low_, which should never be the "next" one, // because it MAY or NOT current start packet of frame but never be the next. @@ -156,7 +156,7 @@ public: // Update the sequence, got the nack range by [low, high]. void update(uint16_t seq, bool startup, uint16_t& nack_low, uint16_t& nack_high); // Get the packet by seq. - SrsRtpPacket2* at(uint16_t seq) { return queue_[seq % capacity_]; } + SrsRtpPacket2* at(uint16_t seq); }; class SrsRtpQueue @@ -186,7 +186,7 @@ public: bool should_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); - void request_keyframe() { request_key_frame_ = true; } + void request_keyframe(); public: uint32_t get_extended_highest_sequence(); uint8_t get_fraction_lost(); diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index d87c65f97..630be08e3 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -457,6 +457,11 @@ SrsConsumer::~SrsConsumer() #endif } +void SrsConsumer::enable_pass_timestamp() +{ + pass_timestamp = true; +} + void SrsConsumer::set_queue_size(srs_utime_t queue_size) { queue->set_queue_size(queue_size); @@ -2764,6 +2769,11 @@ void SrsSource::request_keyframe() } } +void SrsSource::set_rtc_publisher(SrsRtcPublisher* v) +{ + rtc_publisher = v; +} + srs_error_t SrsSource::on_rtc_audio(SrsSharedPtrMessage* audio) { // TODO: FIXME: Merge with on_audio. diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index ac2bad45c..96c6252e3 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -217,7 +217,7 @@ public: virtual ~SrsConsumer(); public: // Use pass timestamp mode. - void enable_pass_timestamp() { pass_timestamp = true; } + void enable_pass_timestamp(); // Set the size of queue. virtual void set_queue_size(srs_utime_t queue_size); // when source id changed, notice client to print. @@ -658,7 +658,7 @@ public: // TODO: FIXME: Maybe we could cache the keyframe. // TODO: FIXME: Maybe we should only response for the new clients. void request_keyframe(); - void set_rtc_publisher(SrsRtcPublisher* v) { rtc_publisher = v; } + void set_rtc_publisher(SrsRtcPublisher* v); // When got RTC audio message, which is encoded in opus. // TODO: FIXME: Merge with on_audio. srs_error_t on_rtc_audio(SrsSharedPtrMessage* audio); diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index 105f75a43..d329a43cf 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -198,6 +198,71 @@ int SrsRtpHeader::nb_bytes() return kRtpHeaderFixedSize + cc * 4 + (extension ? (extension_length + 1) * 4 : 0); } +void SrsRtpHeader::set_marker(bool v) +{ + marker = v; +} + +bool SrsRtpHeader::get_marker() const +{ + return marker; +} + +void SrsRtpHeader::set_payload_type(uint8_t v) +{ + payload_type = v; +} + +uint8_t SrsRtpHeader::get_payload_type() const +{ + return payload_type; +} + +void SrsRtpHeader::set_sequence(uint16_t v) +{ + sequence = v; +} + +uint16_t SrsRtpHeader::get_sequence() const +{ + return sequence; +} + +void SrsRtpHeader::set_timestamp(int64_t v) +{ + timestamp = (uint32_t)v; +} + +int64_t SrsRtpHeader::get_timestamp() const +{ + return timestamp; +} + +void SrsRtpHeader::set_ssrc(uint32_t v) +{ + ssrc = v; +} + +uint32_t SrsRtpHeader::get_ssrc() const +{ + return ssrc; +} + +void SrsRtpHeader::set_padding(bool v) +{ + padding = v; +} + +void SrsRtpHeader::set_padding_length(uint8_t v) +{ + padding_length = v; +} + +uint8_t SrsRtpHeader::get_padding_length() const +{ + return padding_length; +} + ISrsRtpPacketDecodeHandler::ISrsRtpPacketDecodeHandler() { } @@ -285,6 +350,17 @@ SrsRtpFUAPayload2* SrsRtpPacket2::reuse_fua() return cache_fua; } +void SrsRtpPacket2::set_decode_handler(ISrsRtpPacketDecodeHandler* h) +{ + decode_handler = h; +} + +void SrsRtpPacket2::set_original_bytes(char* buf, int nn_buf) +{ + original_bytes = buf; + nn_original_bytes = nn_buf; +} + int SrsRtpPacket2::nb_bytes() { if (!cache_payload) { diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index d97abdb6e..4b539b8fe 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -78,19 +78,19 @@ public: virtual srs_error_t encode(SrsBuffer* buf); virtual int nb_bytes(); public: - inline void set_marker(bool v) { marker = v; } - bool get_marker() const { return marker; } - inline void set_payload_type(uint8_t v) { payload_type = v; } - uint8_t get_payload_type() const { return payload_type; } - inline void set_sequence(uint16_t v) { sequence = v; } - uint16_t get_sequence() const { return sequence; } - inline void set_timestamp(int64_t v) { timestamp = (uint32_t)v; } - int64_t get_timestamp() const { return timestamp; } - inline void set_ssrc(uint32_t v) { ssrc = v; } - uint32_t get_ssrc() const { return ssrc; } - inline void set_padding(bool v) { padding = v; } - inline void set_padding_length(uint8_t v) { padding_length = v; } - uint8_t get_padding_length() const { return padding_length; } + void set_marker(bool v); + bool get_marker() const; + void set_payload_type(uint8_t v); + uint8_t get_payload_type() const; + void set_sequence(uint16_t v); + uint16_t get_sequence() const; + void set_timestamp(int64_t v); + int64_t get_timestamp() const; + void set_ssrc(uint32_t v); + uint32_t get_ssrc() const; + void set_padding(bool v); + void set_padding_length(uint8_t v); + uint8_t get_padding_length() const; }; class ISrsRtpPacketDecodeHandler @@ -150,9 +150,9 @@ public: // Reuse the cached fua message as payload. SrsRtpFUAPayload2* reuse_fua(); // Set the decode handler. - void set_decode_handler(ISrsRtpPacketDecodeHandler* h) { decode_handler = h; } + void set_decode_handler(ISrsRtpPacketDecodeHandler* h); // Set the original bytes. - void set_original_bytes(char* buf, int nn_buf) { original_bytes = buf; nn_original_bytes = nn_buf; } + void set_original_bytes(char* buf, int nn_buf); // interface ISrsEncoder public: virtual int nb_bytes(); @@ -304,6 +304,7 @@ public: SrsRtpH264Header& operator=(const SrsRtpH264Header& rhs); }; +// TODO: FIXME: Merge it with shared message. class SrsRtpSharedPacket { private: diff --git a/trunk/src/protocol/srs_stun_stack.cpp b/trunk/src/protocol/srs_stun_stack.cpp index ed3377762..cabc681ff 100644 --- a/trunk/src/protocol/srs_stun_stack.cpp +++ b/trunk/src/protocol/srs_stun_stack.cpp @@ -98,6 +98,96 @@ SrsStunPacket::~SrsStunPacket() { } +bool SrsStunPacket::is_binding_request() const +{ + return message_type == BindingRequest; +} + +bool SrsStunPacket::is_binding_response() const +{ + return message_type == BindingResponse; +} + +uint16_t SrsStunPacket::get_message_type() const +{ + return message_type; +} + +std::string SrsStunPacket::get_username() const +{ + return username; +} + +std::string SrsStunPacket::get_local_ufrag() const +{ + return local_ufrag; +} + +std::string SrsStunPacket::get_remote_ufrag() const +{ + return remote_ufrag; +} + +std::string SrsStunPacket::get_transcation_id() const +{ + return transcation_id; +} + +uint32_t SrsStunPacket::get_mapped_address() const +{ + return mapped_address; +} + +uint16_t SrsStunPacket::get_mapped_port() const +{ + return mapped_port; +} + +bool SrsStunPacket::get_ice_controlled() const +{ + return ice_controlled; +} + +bool SrsStunPacket::get_ice_controlling() const +{ + return ice_controlling; +} + +bool SrsStunPacket::get_use_candidate() const +{ + return use_candidate; +} + +void SrsStunPacket::set_message_type(const uint16_t& m) +{ + message_type = m; +} + +void SrsStunPacket::set_local_ufrag(const std::string& u) +{ + local_ufrag = u; +} + +void SrsStunPacket::set_remote_ufrag(const std::string& u) +{ + remote_ufrag = u; +} + +void SrsStunPacket::set_transcation_id(const std::string& t) +{ + transcation_id = t; +} + +void SrsStunPacket::set_mapped_address(const uint32_t& addr) +{ + mapped_address = addr; +} + +void SrsStunPacket::set_mapped_port(const uint32_t& port) +{ + mapped_port = port; +} + srs_error_t SrsStunPacket::decode(const char* buf, const int nb_buf) { srs_error_t err = srs_success; diff --git a/trunk/src/protocol/srs_stun_stack.hpp b/trunk/src/protocol/srs_stun_stack.hpp index 92242018d..1f2571138 100644 --- a/trunk/src/protocol/srs_stun_stack.hpp +++ b/trunk/src/protocol/srs_stun_stack.hpp @@ -92,28 +92,25 @@ private: public: SrsStunPacket(); virtual ~SrsStunPacket(); - - bool is_binding_request() const { return message_type == BindingRequest; } - bool is_binding_response() const { return message_type == BindingResponse; } - - uint16_t get_message_type() const { return message_type; } - std::string get_username() const { return username; } - std::string get_local_ufrag() const { return local_ufrag; } - std::string get_remote_ufrag() const { return remote_ufrag; } - std::string get_transcation_id() const { return transcation_id; } - uint32_t get_mapped_address() const { return mapped_address; } - uint16_t get_mapped_port() const { return mapped_port; } - bool get_ice_controlled() const { return ice_controlled; } - bool get_ice_controlling() const { return ice_controlling; } - bool get_use_candidate() const { return use_candidate; } - - void set_message_type(const uint16_t& m) { message_type = m; } - void set_local_ufrag(const std::string& u) { local_ufrag = u; } - void set_remote_ufrag(const std::string& u) { remote_ufrag = u; } - void set_transcation_id(const std::string& t) { transcation_id = t; } - void set_mapped_address(const uint32_t& addr) { mapped_address = addr; } - void set_mapped_port(const uint32_t& port) { mapped_port = port; } - +public: + bool is_binding_request() const; + bool is_binding_response() const; + uint16_t get_message_type() const; + std::string get_username() const; + std::string get_local_ufrag() const; + std::string get_remote_ufrag() const; + std::string get_transcation_id() const; + uint32_t get_mapped_address() const; + uint16_t get_mapped_port() const; + bool get_ice_controlled() const; + bool get_ice_controlling() const; + bool get_use_candidate() const; + void set_message_type(const uint16_t& m); + void set_local_ufrag(const std::string& u); + void set_remote_ufrag(const std::string& u); + void set_transcation_id(const std::string& t); + void set_mapped_address(const uint32_t& addr); + void set_mapped_port(const uint32_t& port); srs_error_t decode(const char* buf, const int nb_buf); srs_error_t encode(const std::string& pwd, SrsBuffer* stream); private: From f57e8de3f9eb1db9153187457f65197cc59af6b7 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 09:53:49 +0800 Subject: [PATCH 35/79] Refactor code, rename rtp_xxx_queue to xxx_queue_ --- trunk/src/app/srs_app_rtc_conn.cpp | 36 ++++++++++++++---------------- trunk/src/app/srs_app_rtc_conn.hpp | 5 ++--- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 177e070aa..24a6645cb 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1465,9 +1465,8 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); rtc_session = session; - rtp_h264_demuxer = new SrsRtpH264Demuxer(); - rtp_video_queue = new SrsRtpQueue(1000); - rtp_audio_queue = new SrsRtpQueue(100, true); + video_queue_ = new SrsRtpQueue(1000); + audio_queue_ = new SrsRtpQueue(100, true); source = NULL; } @@ -1482,9 +1481,8 @@ SrsRtcPublisher::~SrsRtcPublisher() } srs_freep(report_timer); - srs_freep(rtp_h264_demuxer); - srs_freep(rtp_video_queue); - srs_freep(rtp_audio_queue); + srs_freep(video_queue_); + srs_freep(audio_queue_); } srs_error_t SrsRtcPublisher::initialize(uint32_t vssrc, uint32_t assrc, SrsRequest* r) @@ -1663,9 +1661,9 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf) ssrc, compact_ntp, lrr, dlrr, rtt); if (ssrc == video_ssrc) { - rtp_video_queue->update_rtt(rtt); + video_queue_->update_rtt(rtt); } else if (ssrc == audio_ssrc) { - rtp_audio_queue->update_rtt(rtt); + audio_queue_->update_rtt(rtt); } } } @@ -1917,14 +1915,14 @@ srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) pkt->is_key_frame = true; // TODO: FIXME: Error check. - rtp_audio_queue->consume(pkt); + audio_queue_->consume(pkt); - if (rtp_audio_queue->should_request_key_frame()) { + if (audio_queue_->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(audio_ssrc); } - check_send_nacks(rtp_audio_queue, audio_ssrc); + check_send_nacks(audio_queue_, audio_ssrc); return collect_audio_frames(); } @@ -1934,7 +1932,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frames() srs_error_t err = srs_success; std::vector > frames; - rtp_audio_queue->collect_frames(frames); + audio_queue_->collect_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { vector& packets = frames[i]; @@ -2013,14 +2011,14 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) } // TODO: FIXME: Error check. - rtp_video_queue->consume(pkt); + video_queue_->consume(pkt); - if (rtp_video_queue->should_request_key_frame()) { + if (video_queue_->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(video_ssrc); } - check_send_nacks(rtp_video_queue, video_ssrc); + check_send_nacks(video_queue_, video_ssrc); return collect_video_frames(); } @@ -2028,7 +2026,7 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) srs_error_t SrsRtcPublisher::collect_video_frames() { std::vector > frames; - rtp_video_queue->collect_frames(frames); + video_queue_->collect_frames(frames); for (size_t i = 0; i < frames.size(); ++i) { vector& packets = frames[i]; @@ -2224,7 +2222,7 @@ void SrsRtcPublisher::request_keyframe() int pcid = rtc_session->context_id(); srs_trace("RTC play=[%d][%d] request keyframe from publish=[%d][%d]", ::getpid(), scid, ::getpid(), pcid); - rtp_video_queue->request_keyframe(); + video_queue_->request_keyframe(); } srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t tick) @@ -2232,8 +2230,8 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t srs_error_t err = srs_success; // TODO: FIXME: Check error. - send_rtcp_rr(video_ssrc, rtp_video_queue); - send_rtcp_rr(audio_ssrc, rtp_audio_queue); + send_rtcp_rr(video_ssrc, video_queue_); + send_rtcp_rr(audio_ssrc, audio_queue_); send_rtcp_xr_rrtr(video_ssrc); send_rtcp_xr_rrtr(audio_ssrc); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index a5598e28f..892f0ee37 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -260,9 +260,8 @@ private: uint32_t video_ssrc; uint32_t audio_ssrc; private: - SrsRtpH264Demuxer* rtp_h264_demuxer; - SrsRtpQueue* rtp_video_queue; - SrsRtpQueue* rtp_audio_queue; + SrsRtpQueue* video_queue_; + SrsRtpQueue* audio_queue_; private: SrsRequest* req; SrsSource* source; From 42ee52fa29ab580a1d8676b783c7581a9eee06f4 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 10:07:55 +0800 Subject: [PATCH 36/79] Refactor code, extract nack from queue --- trunk/src/app/srs_app_rtc_conn.cpp | 20 +++++++++------- trunk/src/app/srs_app_rtc_conn.hpp | 5 +++- trunk/src/app/srs_app_rtp_queue.cpp | 36 ++++++++++------------------- trunk/src/app/srs_app_rtp_queue.hpp | 11 ++++----- 4 files changed, 32 insertions(+), 40 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 24a6645cb..63beea781 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1466,7 +1466,9 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) rtc_session = session; video_queue_ = new SrsRtpQueue(1000); + video_nack_ = new SrsRtpNackForReceiver(video_queue_, 1000 * 2 / 3); audio_queue_ = new SrsRtpQueue(100, true); + audio_nack_ = new SrsRtpNackForReceiver(video_queue_, 100 * 2 / 3); source = NULL; } @@ -1481,7 +1483,9 @@ SrsRtcPublisher::~SrsRtcPublisher() } srs_freep(report_timer); + srs_freep(video_nack_); srs_freep(video_queue_); + srs_freep(audio_nack_); srs_freep(audio_queue_); } @@ -1661,9 +1665,9 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf) ssrc, compact_ntp, lrr, dlrr, rtt); if (ssrc == video_ssrc) { - video_queue_->update_rtt(rtt); + video_nack_->update_rtt(rtt); } else if (ssrc == audio_ssrc) { - audio_queue_->update_rtt(rtt); + audio_nack_->update_rtt(rtt); } } } @@ -1672,7 +1676,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf) return err; } -void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc) +void SrsRtcPublisher::check_send_nacks(SrsRtpNackForReceiver* nack, uint32_t ssrc) { // If DTLS is not OK, drop all messages. if (!rtc_session->dtls_session) { @@ -1680,7 +1684,7 @@ void SrsRtcPublisher::check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc) } vector nack_seqs; - rtp_queue->get_nack_seqs(nack_seqs); + nack->get_nack_seqs(nack_seqs); vector::iterator iter = nack_seqs.begin(); while (iter != nack_seqs.end()) { char buf[kRtpPacketSize]; @@ -1915,14 +1919,14 @@ srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) pkt->is_key_frame = true; // TODO: FIXME: Error check. - audio_queue_->consume(pkt); + audio_queue_->consume(audio_nack_, pkt); if (audio_queue_->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(audio_ssrc); } - check_send_nacks(audio_queue_, audio_ssrc); + check_send_nacks(audio_nack_, audio_ssrc); return collect_audio_frames(); } @@ -2011,14 +2015,14 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) } // TODO: FIXME: Error check. - video_queue_->consume(pkt); + video_queue_->consume(video_nack_, pkt); if (video_queue_->should_request_key_frame()) { // TODO: FIXME: Check error. send_rtcp_fb_pli(video_ssrc); } - check_send_nacks(video_queue_, video_ssrc); + check_send_nacks(video_nack_, video_ssrc); return collect_video_frames(); } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 892f0ee37..fd54bd60b 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -57,6 +57,7 @@ class SrsRtpH264Demuxer; class SrsRtpOpusDemuxer; class SrsRtpPacket2; class ISrsCodec; +class SrsRtpNackForReceiver; const uint8_t kSR = 200; const uint8_t kRR = 201; @@ -261,7 +262,9 @@ private: uint32_t audio_ssrc; private: SrsRtpQueue* video_queue_; + SrsRtpNackForReceiver* video_nack_; SrsRtpQueue* audio_queue_; + SrsRtpNackForReceiver* audio_nack_; private: SrsRequest* req; SrsSource* source; @@ -278,7 +281,7 @@ public: srs_error_t on_rtcp_sender_report(char* buf, int nb_buf); srs_error_t on_rtcp_xr(char* buf, int nb_buf); private: - void check_send_nacks(SrsRtpQueue* rtp_queue, uint32_t ssrc); + void check_send_nacks(SrsRtpNackForReceiver* nack, uint32_t ssrc); srs_error_t send_rtcp_rr(uint32_t ssrc, SrsRtpQueue* rtp_queue); srs_error_t send_rtcp_xr_rrtr(uint32_t ssrc); srs_error_t send_rtcp_fb_pli(uint32_t ssrc); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index c7f1a0473..4b02eb6a9 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -284,7 +284,6 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) { nn_collected_frames = 0; queue_ = new SrsRtpRingBuffer(capacity); - nack_ = new SrsRtpNackForReceiver(this, capacity * 2 / 3); jitter_ = 0; last_trans_time_ = -1; @@ -303,10 +302,9 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) SrsRtpQueue::~SrsRtpQueue() { srs_freep(queue_); - srs_freep(nack_); } -srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) +srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) { srs_error_t err = srs_success; @@ -314,13 +312,13 @@ srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) srs_utime_t now = srs_update_system_time(); uint16_t seq = pkt->rtp_header.get_sequence(); - SrsRtpNackInfo* nack_info = nack_->find(seq); + SrsRtpNackInfo* nack_info = nack->find(seq); if (nack_info) { int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; (void)nack_rtt; srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); - nack_->remove(seq); + nack->remove(seq); } // Calc jitter time, ignore nack packets. @@ -348,14 +346,14 @@ srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) queue_->update(seq, !nn_collected_frames, nack_low, nack_high); if (srs_rtp_seq_distance(nack_low, nack_high)) { srs_trace("update nack seq=%u, startup=%d, nack range [%u, %u]", seq, !nn_collected_frames, nack_low, nack_high); - insert_into_nack_list(nack_low, nack_high); + insert_into_nack_list(nack, nack_low, nack_high); } } // When packets overflow, collect frame and move head to next frame start. if (queue_->overflow()) { srs_verbose("try collect packet becuase seq out of range"); - collect_packet(); + collect_packet(nack); uint16_t next = queue_->next_start_of_frame(); @@ -366,7 +364,7 @@ srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) srs_trace("seqs out of range, seq range [%u, %u]", queue_->low(), next); for (uint16_t s = queue_->low(); s != next; ++s) { - nack_->remove(s); + nack->remove(s); queue_->remove(s); } @@ -382,7 +380,7 @@ srs_error_t SrsRtpQueue::consume(SrsRtpPacket2* pkt) // 2. Queue has lots of packets, the load is heavy. // 3. The frame contains only one packet for each frame. if (pkt->rtp_header.get_marker() || queue_->is_heavy() || one_packet_per_frame_) { - collect_packet(); + collect_packet(nack); } return err; @@ -465,28 +463,18 @@ uint32_t SrsRtpQueue::get_interarrival_jitter() return static_cast(jitter_); } -void SrsRtpQueue::get_nack_seqs(vector& seqs) -{ - nack_->get_nack_seqs(seqs); -} - -void SrsRtpQueue::update_rtt(int rtt) -{ - nack_->update_rtt(rtt); -} - -void SrsRtpQueue::insert_into_nack_list(uint16_t seq_start, uint16_t seq_end) +void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end) { for (uint16_t s = seq_start; s != seq_end; ++s) { srs_verbose("loss seq=%u, insert into nack list", s); - nack_->insert(s); + nack->insert(s); ++number_of_packet_lossed_; } - nack_->check_queue_size(); + nack->check_queue_size(); } -void SrsRtpQueue::collect_packet() +void SrsRtpQueue::collect_packet(SrsRtpNackForReceiver* nack) { while (queue_->low() != queue_->high()) { vector frame; @@ -496,7 +484,7 @@ void SrsRtpQueue::collect_packet() SrsRtpPacket2* pkt = queue_->at(s); // In NACK, never collect frame. - if (nack_->find(s) != NULL) { + if (nack->find(s) != NULL) { srs_verbose("seq=%u, found in nack list when collect frame", s); return; } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 523bd9f0f..833107d32 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -164,7 +164,6 @@ class SrsRtpQueue private: uint64_t nn_collected_frames; SrsRtpRingBuffer* queue_; - SrsRtpNackForReceiver* nack_; bool one_packet_per_frame_; private: double jitter_; @@ -181,7 +180,8 @@ public: SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); virtual ~SrsRtpQueue(); public: - srs_error_t consume(SrsRtpPacket2* pkt); + srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + // TODO: FIXME: Should merge FU-A to RAW, then we can return RAW payloads. void collect_frames(std::vector >& frames); bool should_request_key_frame(); void notify_drop_seq(uint16_t seq); @@ -192,12 +192,9 @@ public: uint8_t get_fraction_lost(); uint32_t get_cumulative_number_of_packets_lost(); uint32_t get_interarrival_jitter(); -public: - void get_nack_seqs(std::vector& seqs); - void update_rtt(int rtt); private: - void insert_into_nack_list(uint16_t seq_start, uint16_t seq_end); - void collect_packet(); + void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end); + void collect_packet(SrsRtpNackForReceiver* nack); }; #endif From 5c430371900f2406b0dc8e234657872973a34e5e Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 10:24:31 +0800 Subject: [PATCH 37/79] Remove usused RTP shared packet. --- trunk/src/app/srs_app_rtc.cpp | 97 ------------ trunk/src/app/srs_app_rtc.hpp | 19 --- trunk/src/app/srs_app_rtc_conn.cpp | 40 ++--- trunk/src/app/srs_app_rtc_conn.hpp | 2 - trunk/src/app/srs_app_source.cpp | 63 -------- trunk/src/app/srs_app_source.hpp | 33 ----- trunk/src/kernel/srs_kernel_flv.hpp | 1 - trunk/src/kernel/srs_kernel_rtp.cpp | 221 ---------------------------- trunk/src/kernel/srs_kernel_rtp.hpp | 74 ---------- 9 files changed, 16 insertions(+), 534 deletions(-) diff --git a/trunk/src/app/srs_app_rtc.cpp b/trunk/src/app/srs_app_rtc.cpp index 94e833078..5b240539a 100644 --- a/trunk/src/app/srs_app_rtc.cpp +++ b/trunk/src/app/srs_app_rtc.cpp @@ -212,103 +212,6 @@ srs_error_t SrsRtpOpusMuxer::transcode(SrsSharedPtrMessage* shared_audio, char* return err; } -SrsRtpH264Demuxer::SrsRtpH264Demuxer() -{ -} - -SrsRtpH264Demuxer::~SrsRtpH264Demuxer() -{ -} - -srs_error_t SrsRtpH264Demuxer::parse(SrsRtpSharedPacket* rtp_pkt) -{ - srs_error_t err = srs_success; - - SrsRtpH264Header* rtp_h264_header = dynamic_cast(rtp_pkt->rtp_payload_header); - if (rtp_h264_header == NULL) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid rtp packet"); - } - - uint8_t* rtp_payload = reinterpret_cast(rtp_pkt->rtp_payload()); - int rtp_payload_size = rtp_pkt->rtp_payload_size(); - - if (rtp_payload_size == 0) { - srs_verbose("seq=%u, empty payload", rtp_pkt->rtp_header.get_sequence()); - return err; - } - - uint8_t nal_type = rtp_payload[0] & kNalTypeMask; - if (nal_type == SrsAvcNaluTypeIDR) { - rtp_h264_header->is_key_frame = true; - } - - if (nal_type >= 1 && nal_type <= 23) { - rtp_h264_header->is_first_packet_of_frame = true; - rtp_h264_header->is_last_packet_of_frame = true; - rtp_h264_header->nalu_type = nal_type; - rtp_h264_header->nalu_header = rtp_payload[0]; - rtp_h264_header->nalu_offset.push_back(make_pair(0, rtp_payload_size)); - } else if (nal_type == kFuA) { - if ((rtp_payload[1] & kStart)) { - rtp_h264_header->is_first_packet_of_frame = true; - } - if ((rtp_payload[1] & kEnd)) { - rtp_h264_header->is_last_packet_of_frame = true; - } - rtp_h264_header->nalu_type = nal_type; - rtp_h264_header->nalu_header = (rtp_payload[0] & (~kNalTypeMask)) | (rtp_payload[1] & kNalTypeMask); - rtp_h264_header->nalu_offset.push_back(make_pair(2, rtp_payload_size - 2)); - } else if (nal_type == kStapA) { - int i = 1; - rtp_h264_header->is_first_packet_of_frame = true; - rtp_h264_header->is_last_packet_of_frame = true; - rtp_h264_header->nalu_type = nal_type; - while (i < rtp_payload_size) { - uint16_t nal_len = (rtp_payload[i]) << 8 | rtp_payload[i + 1]; - if (nal_len > rtp_payload_size - i) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid stap-a packet, nal len=%u, i=%d, rtp_payload_size=%d", nal_len, i, rtp_payload_size); - } - - rtp_h264_header->nalu_offset.push_back(make_pair(i + 2, nal_len)); - - i += nal_len + 2; - } - - if (i != rtp_payload_size) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid stap-a packet"); - } - } else { - srs_verbose("payload size=%d, payload=%s", rtp_payload_size, srs_string_dumps_hex(rtp_pkt->payload, rtp_pkt->size).c_str()); - return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid h264 rtp packet"); - } - - return err; -} - -SrsRtpOpusDemuxer::SrsRtpOpusDemuxer() -{ -} - -SrsRtpOpusDemuxer::~SrsRtpOpusDemuxer() -{ -} - -srs_error_t SrsRtpOpusDemuxer::parse(SrsRtpSharedPacket* rtp_pkt) -{ - srs_error_t err = srs_success; - - SrsRtpOpusHeader* rtp_opus_header = dynamic_cast(rtp_pkt->rtp_payload_header); - if (rtp_opus_header == NULL) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid rtp packet"); - } - - rtp_opus_header->is_first_packet_of_frame = true; - rtp_opus_header->is_last_packet_of_frame = true; - rtp_opus_header->is_key_frame = true; - - return err; -} - SrsRtc::SrsRtc() { req = NULL; diff --git a/trunk/src/app/srs_app_rtc.hpp b/trunk/src/app/srs_app_rtc.hpp index 99db8bd78..df3f85306 100644 --- a/trunk/src/app/srs_app_rtc.hpp +++ b/trunk/src/app/srs_app_rtc.hpp @@ -33,7 +33,6 @@ class SrsFormat; class SrsSample; class SrsSharedPtrMessage; -class SrsRtpSharedPacket; class SrsRequest; class SrsOriginHub; class SrsAudioRecode; @@ -78,24 +77,6 @@ public: srs_error_t transcode(SrsSharedPtrMessage* shared_audio, char* adts_audio, int nn_adts_audio); }; -class SrsRtpH264Demuxer -{ -public: - SrsRtpH264Demuxer(); - virtual ~SrsRtpH264Demuxer(); -public: - srs_error_t parse(SrsRtpSharedPacket* rtp_pkt); -}; - -class SrsRtpOpusDemuxer -{ -public: - SrsRtpOpusDemuxer(); - virtual ~SrsRtpOpusDemuxer(); -public: - srs_error_t parse(SrsRtpSharedPacket* rtp_pkt); -}; - class SrsRtc { private: diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 63beea781..c8e7c046a 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -449,6 +449,7 @@ srs_error_t SrsDtlsSession::protect_rtp(char* out_buf, const char* in_buf, int& return srs_error_new(ERROR_RTC_SRTP_PROTECT, "rtp protect failed"); } +// TODO: FIXME: Merge with protect_rtp. srs_error_t SrsDtlsSession::protect_rtp2(void* rtp_hdr, int* len_ptr) { srs_error_t err = srs_success; @@ -1921,11 +1922,6 @@ srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) // TODO: FIXME: Error check. audio_queue_->consume(audio_nack_, pkt); - if (audio_queue_->should_request_key_frame()) { - // TODO: FIXME: Check error. - send_rtcp_fb_pli(audio_ssrc); - } - check_send_nacks(audio_nack_, audio_ssrc); return collect_audio_frames(); @@ -2684,6 +2680,10 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) { srs_error_t err = srs_success; + if (!dtls_session) { + return err; + } + if (nb_buf < 12) { return srs_error_new(ERROR_RTC_RTCP_CHECK, "invalid rtp feedback packet, nb_buf=%d", nb_buf); } @@ -2728,12 +2728,8 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) srs_verbose("pid=%u, blp=%d", pid, blp); - vector resend_pkts; // TODO: FIXME: Support ARQ. - SrsRtpSharedPacket* pkt = NULL; // source->find_rtp_packet(pid); - if (pkt) { - resend_pkts.push_back(pkt); - } + vector resend_pkts; uint16_t mask = 0x01; for (int i = 1; i < 16 && blp; ++i, mask <<= 1) { @@ -2745,25 +2741,21 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) // TODO: FIXME: Support ARQ. (void)loss_seq; - SrsRtpSharedPacket* pkt = NULL; // source->find_rtp_packet(loss_seq); - if (!pkt) { - continue; - } - - resend_pkts.push_back(pkt); } for (int i = 0; i < (int)resend_pkts.size(); ++i) { - if (dtls_session) { - char* protected_buf = new char[kRtpPacketSize]; - int nb_protected_buf = resend_pkts[i]->size; + SrsRtpPacket2* pkt = resend_pkts[i]; - srs_verbose("resend pkt sequence=%u", resend_pkts[i]->rtp_header.get_sequence()); + char* protected_buf = new char[kRtpPacketSize]; + SrsAutoFreeA(char, protected_buf); - // TODO: FIXME: Check error. - dtls_session->protect_rtp(protected_buf, resend_pkts[i]->payload, nb_protected_buf); - sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); - } + int nb_protected_buf = resend_pkts[i]->nb_bytes(); + SrsBuffer buf(protected_buf, nb_protected_buf); + + // TODO: FIXME: Check error. + pkt->encode(&buf); + dtls_session->protect_rtp(protected_buf, protected_buf, nb_protected_buf); + sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index fd54bd60b..7d1abae90 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -268,8 +268,6 @@ private: private: SrsRequest* req; SrsSource* source; - std::string sps; - std::string pps; private: std::map last_sender_report_sys_time; std::map last_sender_report_ntp; diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 630be08e3..651801600 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -849,58 +849,6 @@ SrsSharedPtrMessage* SrsMixQueue::pop() return msg; } -#ifdef SRS_RTC -SrsRtpPacketQueue::SrsRtpPacketQueue() -{ -} - -SrsRtpPacketQueue::~SrsRtpPacketQueue() -{ - clear(); -} - -void SrsRtpPacketQueue::clear() -{ - map::iterator iter = pkt_queue.begin(); - while (iter != pkt_queue.end()) { - srs_freep(iter->second); - pkt_queue.erase(iter++); - } -} - -void SrsRtpPacketQueue::push(std::vector& pkts) -{ - for (int i = 0; i < (int)pkts.size(); ++i) { - insert(pkts[i]->rtp_header.get_sequence(), pkts[i]); - } -} - -void SrsRtpPacketQueue::insert(const uint16_t& sequence, SrsRtpSharedPacket* pkt) -{ - pkt_queue.insert(make_pair(sequence, pkt->copy())); - // TODO: 3000 is magic number. - if (pkt_queue.size() >= 3000) { - srs_freep(pkt_queue.begin()->second); - pkt_queue.erase(pkt_queue.begin()); - } -} - -SrsRtpSharedPacket* SrsRtpPacketQueue::find(const uint16_t& sequence) -{ - if (pkt_queue.empty()) { - return NULL; - } - - SrsRtpSharedPacket* pkt = NULL; - map::iterator iter = pkt_queue.find(sequence); - if (iter != pkt_queue.end()) { - pkt = iter->second->copy(); - } - - return pkt; -} -#endif - SrsOriginHub::SrsOriginHub() { source = NULL; @@ -1955,9 +1903,6 @@ SrsSource::SrsSource() jitter_algorithm = SrsRtmpJitterAlgorithmOFF; mix_correct = false; mix_queue = new SrsMixQueue(); -#ifdef SRS_RTC - rtp_queue = new SrsRtpPacketQueue(); -#endif _can_publish = true; _pre_source_id = _source_id = -1; @@ -1991,9 +1936,6 @@ SrsSource::~SrsSource() srs_freep(hub); srs_freep(meta); srs_freep(mix_queue); -#ifdef SRS_RTC - srs_freep(rtp_queue); -#endif srs_freep(play_edge); srs_freep(publish_edge); @@ -2752,11 +2694,6 @@ string SrsSource::get_curr_origin() } #ifdef SRS_RTC -SrsRtpSharedPacket* SrsSource::find_rtp_packet(const uint16_t& seq) -{ - return rtp_queue->find(seq); -} - SrsMetaCache* SrsSource::cached_meta() { return meta; diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 96c6252e3..7b6a96107 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -62,7 +62,6 @@ class SrsBuffer; #ifdef SRS_HDS class SrsHds; #endif -class SrsRtpSharedPacket; #ifdef SRS_RTC class SrsRtcPublisher; #endif @@ -336,32 +335,6 @@ public: virtual SrsSharedPtrMessage* pop(); }; -#ifdef SRS_RTC -// To find the RTP packet for RTX or restore. -// TODO: FIXME: Should queue RTP packets in connection level. -class SrsRtpPacketQueue -{ -private: - struct SeqComp - { - bool operator()(const uint16_t& l, const uint16_t& r) const - { - return ((int16_t)(r - l)) > 0; - } - }; -private: - std::map pkt_queue; -public: - SrsRtpPacketQueue(); - virtual ~SrsRtpPacketQueue(); -public: - void clear(); - void push(std::vector& pkts); - void insert(const uint16_t& sequence, SrsRtpSharedPacket* pkt); - SrsRtpSharedPacket* find(const uint16_t& sequence); -}; -#endif - // The hub for origin is a collection of utilities for origin only, // For example, DVR, HLS, Forward and Transcode are only available for origin, // they are meanless for edge server. @@ -550,10 +523,6 @@ private: bool mix_correct; // The mix queue to implements the mix correct algorithm. SrsMixQueue* mix_queue; -#ifdef SRS_RTC - // rtp packet queue - SrsRtpPacketQueue* rtp_queue; -#endif // For play, whether enabled atc. // The atc(use absolute time and donot adjust time), // directly use msg time and donot adjust if atc is true, @@ -650,8 +619,6 @@ public: virtual std::string get_curr_origin(); #ifdef SRS_RTC public: - // Find rtp packet by sequence - SrsRtpSharedPacket* find_rtp_packet(const uint16_t& seq); // Get the cached meta, as such the sps/pps. SrsMetaCache* cached_meta(); // Request keyframe for new client. diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index 7545aa5b7..91faaa2a0 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -39,7 +39,6 @@ class ISrsWriter; class ISrsReader; class SrsFileReader; class SrsPacket; -class SrsRtpSharedPacket; class SrsSample; #define SRS_FLV_TAG_HEADER_SIZE 11 diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index d329a43cf..a50fe7781 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -853,224 +853,3 @@ srs_error_t SrsRtpFUAPayload2::decode(SrsBuffer* buf) return srs_success; } - -SrsRtpPayloadHeader::SrsRtpPayloadHeader() -{ - is_first_packet_of_frame = false; - is_last_packet_of_frame = false; - is_key_frame = false; -} - -SrsRtpPayloadHeader::~SrsRtpPayloadHeader() -{ -} - -SrsRtpPayloadHeader::SrsRtpPayloadHeader(const SrsRtpPayloadHeader& rhs) -{ - operator=(rhs); -} - -SrsRtpPayloadHeader& SrsRtpPayloadHeader::operator=(const SrsRtpPayloadHeader& rhs) -{ - is_first_packet_of_frame = rhs.is_first_packet_of_frame; - is_last_packet_of_frame = rhs.is_last_packet_of_frame; - - return *this; -} - -SrsRtpH264Header::SrsRtpH264Header() : SrsRtpPayloadHeader() -{ -} - -SrsRtpH264Header::~SrsRtpH264Header() -{ -} - -SrsRtpH264Header::SrsRtpH264Header(const SrsRtpH264Header& rhs) -{ - operator=(rhs); -} - -SrsRtpH264Header& SrsRtpH264Header::operator=(const SrsRtpH264Header& rhs) -{ - SrsRtpPayloadHeader::operator=(rhs); - nalu_type = rhs.nalu_type; - nalu_header = rhs.nalu_header; - nalu_offset = rhs.nalu_offset; - - return *this; -} - -SrsRtpOpusHeader::SrsRtpOpusHeader() : SrsRtpPayloadHeader() -{ -} - -SrsRtpOpusHeader::~SrsRtpOpusHeader() -{ -} - -SrsRtpOpusHeader::SrsRtpOpusHeader(const SrsRtpOpusHeader& rhs) -{ - operator=(rhs); -} - -SrsRtpOpusHeader& SrsRtpOpusHeader::operator=(const SrsRtpOpusHeader& rhs) -{ - SrsRtpPayloadHeader::operator=(rhs); - return *this; -} - -SrsRtpSharedPacket::SrsRtpSharedPacketPayload::SrsRtpSharedPacketPayload() -{ - payload = NULL; - size = 0; - shared_count = 0; -} - -SrsRtpSharedPacket::SrsRtpSharedPacketPayload::~SrsRtpSharedPacketPayload() -{ - srs_freepa(payload); -} - -SrsRtpSharedPacket::SrsRtpSharedPacket() -{ - payload_ptr = NULL; - - payload = NULL; - size = 0; - - rtp_payload_header = NULL; -} - -SrsRtpSharedPacket::~SrsRtpSharedPacket() -{ - if (payload_ptr) { - if (payload_ptr->shared_count == 0) { - srs_freep(payload_ptr); - } else { - --payload_ptr->shared_count; - } - } - - srs_freep(rtp_payload_header); -} - -srs_error_t SrsRtpSharedPacket::create(SrsRtpHeader* rtp_h, SrsRtpPayloadHeader* rtp_ph, char* p, int s) -{ - srs_error_t err = srs_success; - - if (s < 0) { - return srs_error_new(ERROR_RTP_PACKET_CREATE, "create packet size=%d", s); - } - - srs_assert(!payload_ptr); - - this->rtp_header = *rtp_h; - this->rtp_payload_header = rtp_ph; - - // TODO: rtp header padding. - int buffer_size = rtp_header.nb_bytes() + s; - - char* buffer = new char[buffer_size]; - SrsBuffer stream(buffer, buffer_size); - if ((err = rtp_header.encode(&stream)) != srs_success) { - srs_freepa(buffer); - return srs_error_wrap(err, "rtp header encode"); - } - - stream.write_bytes(p, s); - payload_ptr = new SrsRtpSharedPacketPayload(); - payload_ptr->payload = buffer; - payload_ptr->size = buffer_size; - - this->payload = payload_ptr->payload; - this->size = payload_ptr->size; - - return err; -} - -srs_error_t SrsRtpSharedPacket::decode(char* buf, int nb_buf) -{ - srs_error_t err = srs_success; - - SrsBuffer stream(buf, nb_buf); - if ((err = rtp_header.decode(&stream)) != srs_success) { - return srs_error_wrap(err, "rtp header decode failed"); - } - - payload_ptr = new SrsRtpSharedPacketPayload(); - payload_ptr->payload = buf; - payload_ptr->size = nb_buf; - - this->payload = payload_ptr->payload; - this->size = payload_ptr->size; - - return err; -} - -SrsRtpSharedPacket* SrsRtpSharedPacket::copy() -{ - SrsRtpSharedPacket* copy = new SrsRtpSharedPacket(); - - copy->payload_ptr = payload_ptr; - payload_ptr->shared_count++; - - copy->rtp_header = rtp_header; - if (dynamic_cast(rtp_payload_header)) { - copy->rtp_payload_header = new SrsRtpH264Header(*(dynamic_cast(rtp_payload_header))); - } else if (dynamic_cast(rtp_payload_header)) { - copy->rtp_payload_header = new SrsRtpOpusHeader(*(dynamic_cast(rtp_payload_header))); - } - - copy->payload = payload; - copy->size = size; - - return copy; -} - -srs_error_t SrsRtpSharedPacket::modify_rtp_header_marker(bool marker) -{ - srs_error_t err = srs_success; - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); - } - - rtp_header.set_marker(marker); - if (marker) { - payload_ptr->payload[1] |= kRtpMarker; - } else { - payload_ptr->payload[1] &= (~kRtpMarker); - } - - return err; -} - -srs_error_t SrsRtpSharedPacket::modify_rtp_header_ssrc(uint32_t ssrc) -{ - srs_error_t err = srs_success; - - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); - } - - rtp_header.set_ssrc(ssrc); - - SrsBuffer stream(payload_ptr->payload + 8, 4); - stream.write_4bytes(ssrc); - - return err; -} - -srs_error_t SrsRtpSharedPacket::modify_rtp_header_payload_type(uint8_t payload_type) -{ - srs_error_t err = srs_success; - - if (payload_ptr == NULL || payload_ptr->payload == NULL || payload_ptr->size < kRtpHeaderFixedSize) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "rtp payload incorrect"); - } - - rtp_header.set_payload_type(payload_type); - payload_ptr->payload[1] = (payload_ptr->payload[1] & 0x80) | payload_type; - - return err; -} diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index 4b539b8fe..c587113c8 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -269,78 +269,4 @@ public: virtual srs_error_t decode(SrsBuffer* buf); }; -class SrsRtpPayloadHeader -{ -public: - bool is_first_packet_of_frame; - bool is_last_packet_of_frame; - bool is_key_frame; -public: - SrsRtpPayloadHeader(); - virtual ~SrsRtpPayloadHeader(); - SrsRtpPayloadHeader(const SrsRtpPayloadHeader& rhs); - SrsRtpPayloadHeader& operator=(const SrsRtpPayloadHeader& rhs); -}; - -class SrsRtpOpusHeader : public SrsRtpPayloadHeader -{ -public: - SrsRtpOpusHeader(); - virtual ~SrsRtpOpusHeader(); - SrsRtpOpusHeader(const SrsRtpOpusHeader& rhs); - SrsRtpOpusHeader& operator=(const SrsRtpOpusHeader& rhs); -}; - -class SrsRtpH264Header : public SrsRtpPayloadHeader -{ -public: - uint8_t nalu_type; - uint8_t nalu_header; - std::vector > nalu_offset; // offset, size -public: - SrsRtpH264Header(); - virtual ~SrsRtpH264Header(); - SrsRtpH264Header(const SrsRtpH264Header& rhs); - SrsRtpH264Header& operator=(const SrsRtpH264Header& rhs); -}; - -// TODO: FIXME: Merge it with shared message. -class SrsRtpSharedPacket -{ -private: - class SrsRtpSharedPacketPayload - { - public: - // Rtp packet buffer, include rtp header and payload. - char* payload; - int size; - int shared_count; - public: - SrsRtpSharedPacketPayload(); - virtual ~SrsRtpSharedPacketPayload(); - }; -private: - SrsRtpSharedPacketPayload* payload_ptr; -public: - SrsRtpHeader rtp_header; - SrsRtpPayloadHeader* rtp_payload_header; - char* payload; - int size; -public: - SrsRtpSharedPacket(); - virtual ~SrsRtpSharedPacket(); -public: - srs_error_t create(SrsRtpHeader* rtp_h, SrsRtpPayloadHeader* rtp_ph, char* p, int s); - srs_error_t decode(char* buf, int nb_buf); - SrsRtpSharedPacket* copy(); -public: - char* rtp_payload() { return payload + rtp_header.nb_bytes(); } - int rtp_payload_size() { return size - rtp_header.nb_bytes() - rtp_header.get_padding_length(); } -// Interface to modify rtp header -public: - srs_error_t modify_rtp_header_marker(bool marker); - srs_error_t modify_rtp_header_ssrc(uint32_t ssrc); - srs_error_t modify_rtp_header_payload_type(uint8_t payload_type); -}; - #endif From 780753c0ec29f9fdbc14fb20d2574f01ed7ff1f4 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 2 May 2020 20:57:36 +0800 Subject: [PATCH 38/79] Refine code for RTC publisher --- trunk/src/app/srs_app_rtc_conn.cpp | 132 +++++++++--------- trunk/src/app/srs_app_rtp_queue.cpp | 200 +++++++++++++++++++--------- trunk/src/app/srs_app_rtp_queue.hpp | 43 ++++-- trunk/src/kernel/srs_kernel_rtp.cpp | 46 ++++++- trunk/src/kernel/srs_kernel_rtp.hpp | 3 + 5 files changed, 284 insertions(+), 140 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index c8e7c046a..5c58a2667 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1458,6 +1458,8 @@ srs_error_t SrsRtcSenderThread::package_stap_a(SrsSource* source, SrsSharedPtrMe stap->nalus.push_back(sample); } + srs_trace("RTC STAP-A seq=%u, sps %d, pps %d bytes", packet->rtp_header.get_sequence(), sps.size(), pps.size()); + return err; } @@ -1466,10 +1468,10 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); rtc_session = session; - video_queue_ = new SrsRtpQueue(1000); + video_queue_ = new SrsRtpVideoQueue(1000); video_nack_ = new SrsRtpNackForReceiver(video_queue_, 1000 * 2 / 3); - audio_queue_ = new SrsRtpQueue(100, true); - audio_nack_ = new SrsRtpNackForReceiver(video_queue_, 100 * 2 / 3); + audio_queue_ = new SrsRtpAudioQueue(100); + audio_nack_ = new SrsRtpNackForReceiver(audio_queue_, 100 * 2 / 3); source = NULL; } @@ -2055,10 +2057,10 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& SrsAvcNaluType nalu_type = head->nalu_type; int64_t timestamp = head->rtp_header.get_timestamp(); + // For FU-A or STAP-A, there must be more than one packets. if (nalu_type == (SrsAvcNaluType)kFuA) { - // For FU-A, there must be more than one packets. if (packets.size() < 2) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A %d packets", packets.size()); + return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A/STAP-A %#x %d packets", nalu_type, packets.size()); } } else { // For others type, should be one packet for one frame. @@ -2069,50 +2071,51 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& // For FU-A, group packets to one video frame. if (nalu_type == (SrsAvcNaluType)kFuA) { - int nn_payload = 0; + int nn_nalus = 0; for (size_t i = 0; i < packets.size(); ++i) { SrsRtpPacket2* pkt = packets[i]; SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); } - nn_payload += payload->size; + nn_nalus += payload->size; } - if (!nn_payload) { + if (!nn_nalus) { return err; } // TODO: FIXME: Directly covert to sample for performance. - // 1 byte NALU header. // 5 bytes FLV tag header. - nn_payload += 1 + 5; + // 4 bytes NALU IBMF header, define by sequence header. + // 1 byte NALU header. + nn_nalus += 1; + int nn_payload = nn_nalus + 5 + 4; char* data = new char[nn_payload]; - SrsRtpFUAPayload2* head_payload = dynamic_cast(head->payload); + SrsBuffer buf(data, nn_payload); - char* p = data + 5; - *p++ = head_payload->nri | head_payload->nalu_type; + SrsRtpFUAPayload2* head_payload = dynamic_cast(head->payload); + if (head_payload->nalu_type == SrsAvcNaluTypeIDR) { + buf.write_1bytes(0x17); // Keyframe. + srs_trace("RTC got IDR %d bytes", nn_nalus); + } else { + buf.write_1bytes(0x27); // Not Keyframe. + } + buf.write_1bytes(0x01); // Not Sequence header. + buf.write_3bytes(0x00); // CTS. + buf.write_4bytes(nn_nalus); + + buf.write_1bytes(head_payload->nri | head_payload->nalu_type); // NALU header. for (size_t i = 0; i < packets.size(); ++i) { SrsRtpPacket2* pkt = packets[i]; SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); - memcpy(p, payload->payload, payload->size); - p += payload->size; + buf.write_bytes(payload->payload, payload->size); } - if (head_payload->nalu_type == SrsAvcNaluTypeIDR) { - data[0] = 0x17; - } else { - data[0] = 0x27; - } - data[1] = 0x01; - data[2] = 0x00; - data[3] = 0x00; - data[4] = 0x00; - SrsMessageHeader header; header.message_type = RTMP_MSG_VideoMessage; // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = timestamp / 90; + header.timestamp = (timestamp / 90) & 0x3fffffff; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); // TODO: FIXME: Check error. @@ -2127,49 +2130,47 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload"); } - if (payload->nalus.size() != 2) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload %d nalus", payload->nalus.size()); - } - SrsSample* sps = payload->nalus[0]; - SrsSample* pps = payload->nalus[1]; - if (!sps->size || !pps->size) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload %d sps, %d pps", sps->size, pps->size); + SrsSample* sps = payload->get_sps(); + SrsSample* pps = payload->get_pps(); + if (!sps || !sps->size) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload no sps"); + } + if (!pps || !pps->size) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload no pps"); } // TODO: FIXME: Directly covert to sample for performance. // 5 bytes flv tag header. - // 6 bytes sps/pps sequence header. - // 1 byte seperator between sps and pps. - int nn_payload = sps->size + pps->size + 5 + 6 + 1; + // 5 bytes sps/pps sequence header. + // 6 bytes size for sps/pps, each is 3 bytes. + int nn_payload = sps->size + pps->size + 5 + 5 + 6; char* data = new char[nn_payload]; SrsBuffer buf(data, nn_payload); - buf.write_1bytes(0x17); - buf.write_1bytes(0x00); - buf.write_1bytes(0x00); - buf.write_1bytes(0x00); - buf.write_1bytes(0x00); + + buf.write_1bytes(0x17); // Keyframe. + buf.write_1bytes(0x00); // Sequence header. + buf.write_3bytes(0x00); // CTS. // FIXME: Replace magic number for avc_demux_sps_pps. - buf.write_1bytes(0x01); - buf.write_1bytes(0x42); - buf.write_1bytes(0xC0); - buf.write_1bytes(0x1E); - buf.write_1bytes(0xFF); - buf.write_1bytes(0xE1); + buf.write_1bytes(0x01); // configurationVersion + buf.write_1bytes(0x42); // AVCProfileIndication, 0x42 = Baseline + buf.write_1bytes(0xC0); // profile_compatibility + buf.write_1bytes(0x1f); // AVCLevelIndication, 0x1f = Level3.1 + buf.write_1bytes(0x03); // lengthSizeMinusOne, size of length for NALU. - buf.write_2bytes(sps->size); - buf.write_string(sps->bytes); + buf.write_1bytes(0x01); // numOfSequenceParameterSets + buf.write_2bytes(sps->size); // sequenceParameterSetLength + buf.write_bytes(sps->bytes, sps->size); // sps - buf.write_1bytes(0x01); - - buf.write_2bytes(pps->size); - buf.write_string(pps->bytes); + buf.write_1bytes(0x01); // numOfPictureParameterSets + buf.write_2bytes(pps->size); // pictureParameterSetLength + buf.write_bytes(pps->bytes, pps->size); // pps SrsMessageHeader header; header.message_type = RTMP_MSG_VideoMessage; // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = timestamp / 90; + header.timestamp = (timestamp / 90) & 0x3fffffff; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); // TODO: FIXME: Check error. @@ -2188,27 +2189,28 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& } // TODO: FIXME: Directly covert to sample for performance. - // 1 byte NALU header. // 5 bytes FLV tag header. - int nn_payload = payload->nn_payload + 1 + 5; + // 4 bytes NALU IBMF header, define by sequence header. + int nn_payload = payload->nn_payload + 5 + 4; char* data = new char[nn_payload]; + SrsBuffer buf(data, nn_payload); if (nalu_type == SrsAvcNaluTypeIDR) { - data[0] = 0x17; + buf.write_1bytes(0x17); // Keyframe. + srs_trace("RTC got IDR %d bytes", nn_payload); } else { - data[0] = 0x27; + buf.write_1bytes(0x27); // Not-Keyframe. } - data[1] = 0x01; - data[2] = 0x00; - data[3] = 0x00; - data[4] = 0x00; + buf.write_1bytes(0x01); // Not-SequenceHeader. + buf.write_3bytes(0x00); // CTS. - memcpy(data + 5, payload->payload, payload->nn_payload); + buf.write_4bytes(payload->nn_payload); // Size of NALU. + buf.write_bytes(payload->payload, payload->nn_payload); // NALU. SrsMessageHeader header; header.message_type = RTMP_MSG_VideoMessage; // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = timestamp / 90; + header.timestamp = (timestamp / 90) & 0x3fffffff; SrsCommonMessage* shared_video = new SrsCommonMessage(); SrsAutoFree(SrsCommonMessage, shared_video); // TODO: FIXME: Check error. @@ -2578,6 +2580,7 @@ srs_error_t SrsRtcSession::start_publish() srs_freep(publisher); publisher = new SrsRtcPublisher(this); + publisher->request_keyframe(); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -3382,6 +3385,7 @@ srs_error_t SrsRtcServer::create_rtc_session( } } + // TODO: FIXME: In answer, we should use the same SSRC as in offer. session->set_remote_sdp(remote_sdp); session->set_local_sdp(local_sdp); diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 4b02eb6a9..5adef6e95 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -81,7 +81,6 @@ SrsRtpNackInfo* SrsRtpNackForReceiver::find(uint16_t seq) void SrsRtpNackForReceiver::check_queue_size() { if (queue_.size() >= max_queue_size_) { - srs_verbose("NACK list full, queue size=%u, max_queue_size=%u", queue_.size(), max_queue_size_); rtp_queue_->notify_nack_list_full(); } } @@ -102,9 +101,6 @@ void SrsRtpNackForReceiver::get_nack_seqs(vector& seqs) int alive_time = now - nack_info.generate_time_; if (alive_time > opts_.max_alive_time || nack_info.req_nack_count_ > opts_.max_count) { - srs_verbose("NACK, drop seq=%u alive time %d bigger than max_alive_time=%d OR nack count %d bigger than %d", - seq, alive_time, opts_.max_alive_time, nack_info.req_nack_count_, opts_.max_count); - rtp_queue_->notify_drop_seq(seq); queue_.erase(iter++); continue; @@ -119,7 +115,6 @@ void SrsRtpNackForReceiver::get_nack_seqs(vector& seqs) ++nack_info.req_nack_count_; nack_info.pre_req_nack_time_ = now; seqs.push_back(seq); - srs_verbose("NACK, resend seq=%u, count=%d", seq, nack_info.req_nack_count_); } ++iter; @@ -129,16 +124,15 @@ void SrsRtpNackForReceiver::get_nack_seqs(vector& seqs) void SrsRtpNackForReceiver::update_rtt(int rtt) { rtt_ = rtt * SRS_UTIME_MILLISECONDS; - srs_verbose("NACK, update rtt from %ld to %d", opts_.nack_interval, rtt_); // FIXME: limit min and max value. opts_.nack_interval = rtt_; } -SrsRtpRingBuffer::SrsRtpRingBuffer(size_t capacity) +SrsRtpRingBuffer::SrsRtpRingBuffer(int capacity) { nn_seq_flip_backs = 0; high_ = low_ = 0; - capacity_ = capacity; + capacity_ = (uint16_t)capacity; initialized_ = false; queue_ = new SrsRtpPacket2*[capacity_]; @@ -190,7 +184,7 @@ void SrsRtpRingBuffer::reset(uint16_t low, uint16_t high) bool SrsRtpRingBuffer::overflow() { - return high_ - low_ < capacity_; + return high_ - low_ >= capacity_; } bool SrsRtpRingBuffer::is_heavy() @@ -251,7 +245,6 @@ void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, ui // When distance(seq,high_)>0 and seq0 and 1<65535. if (seq < high_) { - srs_verbose("warp around, flip_back=%" PRId64, nn_seq_flip_backs); ++nn_seq_flip_backs; } high_ = seq; @@ -266,11 +259,7 @@ void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, ui if (startup) { nack_low = seq + 1; nack_high = low_; - - srs_info("head seq=%u, cur seq=%u, update head seq because recv less than it.", low_, seq); low_ = seq; - } else { - srs_verbose("seq=%u, rtx success, too old", seq); } } } @@ -280,7 +269,7 @@ SrsRtpPacket2* SrsRtpRingBuffer::at(uint16_t seq) return queue_[seq % capacity_]; } -SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) +SrsRtpQueue::SrsRtpQueue(const char* tag, int capacity) { nn_collected_frames = 0; queue_ = new SrsRtpRingBuffer(capacity); @@ -294,9 +283,8 @@ SrsRtpQueue::SrsRtpQueue(size_t capacity, bool one_packet_per_frame) num_of_packet_received_ = 0; number_of_packet_lossed_ = 0; - one_packet_per_frame_ = one_packet_per_frame; - request_key_frame_ = false; + tag_ = tag; } SrsRtpQueue::~SrsRtpQueue() @@ -316,8 +304,6 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt if (nack_info) { int nack_rtt = nack_info->req_nack_count_ ? ((now - nack_info->pre_req_nack_time_) / SRS_UTIME_MILLISECONDS) : 0; (void)nack_rtt; - srs_verbose("seq=%u, alive time=%d, nack count=%d, rtx success, resend use %dms", - seq, now - nack_info->generate_time_, nack_info->req_nack_count_, nack_rtt); nack->remove(seq); } @@ -336,7 +322,6 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt last_trans_time_ = trans_time; jitter_ = (jitter_ * 15.0 / 16.0) + (static_cast(cur_jitter) / 16.0); - srs_verbose("jitter=%.2f", jitter_); } // OK, we got one new RTP packet, which is not in NACK. @@ -345,14 +330,13 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt uint16_t nack_low = 0, nack_high = 0; queue_->update(seq, !nn_collected_frames, nack_low, nack_high); if (srs_rtp_seq_distance(nack_low, nack_high)) { - srs_trace("update nack seq=%u, startup=%d, nack range [%u, %u]", seq, !nn_collected_frames, nack_low, nack_high); + srs_trace("%s update nack seq=%u, startup=%d, range [%u, %u]", tag_, seq, !nn_collected_frames, nack_low, nack_high); insert_into_nack_list(nack, nack_low, nack_high); } } // When packets overflow, collect frame and move head to next frame start. if (queue_->overflow()) { - srs_verbose("try collect packet becuase seq out of range"); collect_packet(nack); uint16_t next = queue_->next_start_of_frame(); @@ -361,28 +345,20 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt if (next == queue_->low()) { next = queue_->high() - 1; } - srs_trace("seqs out of range, seq range [%u, %u]", queue_->low(), next); + srs_trace("%s seq out of range [%u, %u]", tag_, queue_->low(), next); for (uint16_t s = queue_->low(); s != next; ++s) { nack->remove(s); queue_->remove(s); } - srs_trace("force update, update head seq from %u to %u when seqs out of range", queue_->low(), next + 1); + srs_trace("%s force update seq %u to %u", tag_, queue_->low(), next + 1); queue_->advance_to(next + 1); } // Save packet at the position seq. queue_->set(seq, pkt); - // Collect packets to frame when: - // 1. Marker bit means the last packet of frame received. - // 2. Queue has lots of packets, the load is heavy. - // 3. The frame contains only one packet for each frame. - if (pkt->rtp_header.get_marker() || queue_->is_heavy() || one_packet_per_frame_) { - collect_packet(nack); - } - return err; } @@ -411,7 +387,7 @@ void SrsRtpQueue::notify_drop_seq(uint16_t seq) } // When NACK is timeout, move to the next start of frame. - srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); + srs_trace("%s nack drop seq=%u, drop range [%u, %u]", tag_, seq, queue_->low(), next + 1); queue_->advance_to(next + 1); } @@ -425,7 +401,7 @@ void SrsRtpQueue::notify_nack_list_full() } // When NACK is overflow, move to the next keyframe. - srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); + srs_trace("%s nack overflow drop range [%u, %u]", tag_, queue_->low(), next + 1); queue_->advance_to(next + 1); } @@ -466,7 +442,6 @@ uint32_t SrsRtpQueue::get_interarrival_jitter() void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end) { for (uint16_t s = seq_start; s != seq_end; ++s) { - srs_verbose("loss seq=%u, insert into nack list", s); nack->insert(s); ++number_of_packet_lossed_; } @@ -474,46 +449,147 @@ void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t se nack->check_queue_size(); } -void SrsRtpQueue::collect_packet(SrsRtpNackForReceiver* nack) +SrsRtpAudioQueue::SrsRtpAudioQueue(int capacity) : SrsRtpQueue("audio", capacity) +{ +} + +SrsRtpAudioQueue::~SrsRtpAudioQueue() +{ +} + +srs_error_t SrsRtpAudioQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) +{ + srs_error_t err = srs_success; + + if ((err = SrsRtpQueue::consume(nack, pkt)) != srs_success) { + return srs_error_wrap(err, "audio queue"); + } + + // For audio, always try to collect frame, because each packet is a frame. + collect_packet(nack); + + return err; +} + +void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) +{ + // When done, s point to the next available packet. + uint16_t next = queue_->low(); + + for (; next != queue_->high(); ++next) { + SrsRtpPacket2* pkt = queue_->at(next); + + // Not found or in NACK, stop collecting frame. + if (!pkt || nack->find(next) != NULL) { + srs_trace("%s wait for nack seq=%u", tag_, next); + break; + } + + // OK, collect packet to frame. + vector frame; + frame.push_back(pkt); + + // Done, we got the last packet of frame. + nn_collected_frames++; + frames_.push_back(frame); + } + + if (queue_->low() != next) { + // Reset the range of packets to NULL in buffer. + queue_->reset(queue_->low(), next); + + srs_verbose("%s collect on frame, update head seq=%u t %u", tag_, queue_->low(), next); + queue_->advance_to(next); + } +} + +SrsRtpVideoQueue::SrsRtpVideoQueue(int capacity) : SrsRtpQueue("video", capacity) +{ +} + +SrsRtpVideoQueue::~SrsRtpVideoQueue() +{ +} + +srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) +{ + srs_error_t err = srs_success; + + if ((err = SrsRtpQueue::consume(nack, pkt)) != srs_success) { + return srs_error_wrap(err, "video queue"); + } + + // Collect packets to frame when: + // 1. Marker bit means the last packet of frame received. + // 2. Queue has lots of packets, the load is heavy. + // TODO: FIMXE: For real-time, we should collect each frame ASAP. + if (pkt->rtp_header.get_marker() || queue_->is_heavy()) { + collect_packet(nack); + } + + return err; +} + +void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack) { while (queue_->low() != queue_->high()) { vector frame; - uint16_t s = queue_->low(); - for (; s != queue_->high(); ++s) { - SrsRtpPacket2* pkt = queue_->at(s); + do_collect_packet(nack, frame); - // In NACK, never collect frame. - if (nack->find(s) != NULL) { - srs_verbose("seq=%u, found in nack list when collect frame", s); - return; - } + if (frame.empty()) { + return; + } - // Ignore when the first packet not the start. - if (s == queue_->low() && pkt->nn_original_payload && !pkt->is_first_packet_of_frame) { - return; - } + nn_collected_frames++; + frames_.push_back(frame); + } +} - // OK, collect packet to frame. - frame.push_back(pkt); +// TODO: FIXME: Should refer to the FU-A original video frame, to avoid finding for each packet. +void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vector& frame) +{ + // When done, s point to the next available packet. + uint16_t next = queue_->low(); - // Not the last packet, continue to process next one. - if (!pkt->rtp_header.get_marker() && !one_packet_per_frame_) { - continue; - } + bool found = false; + for (; next != queue_->high(); ++next) { + SrsRtpPacket2* pkt = queue_->at(next); - // Done, we got the last packet of frame. - nn_collected_frames++; - frames_.push_back(frame); + // Not found or in NACK, stop collecting frame. + if (!pkt || nack->find(next) != NULL) { + srs_trace("%s wait for nack seq=%u", tag_, next); break; } - if (queue_->low() != s) { - // Reset the range of packets to NULL in buffer. - queue_->reset(queue_->low(), s); + // Ignore when the first packet not the start. + if (next == queue_->low() && !pkt->is_first_packet_of_frame) { + break; + } - srs_verbose("head seq=%u, update to %u because collect one full farme", queue_->low(), s + 1); - queue_->advance_to(s + 1); + // OK, collect packet to frame. + frame.push_back(pkt); + + // Done, we got the last packet of frame. + // @remark Note that the STAP-A is marker false and it's the last packet. + if (pkt->rtp_header.get_marker() || pkt->is_last_packet_of_frame) { + found = true; + next++; + break; } } + + if (!found) { + frame.clear(); + } + + uint16_t cur = next - 1; + if (found && cur != queue_->high()) { + // Reset the range of packets to NULL in buffer. + queue_->reset(queue_->low(), next); + + srs_verbose("%s collect on frame, update head seq=%u t %u", tag_, queue_->low(), next); + queue_->advance_to(next); + } } + diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 833107d32..cb14a3d19 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -129,7 +129,7 @@ private: uint16_t low_; uint16_t high_; public: - SrsRtpRingBuffer(size_t capacity); + SrsRtpRingBuffer(int capacity); virtual ~SrsRtpRingBuffer(); public: // Move the position of buffer. @@ -161,10 +161,6 @@ public: class SrsRtpQueue { -private: - uint64_t nn_collected_frames; - SrsRtpRingBuffer* queue_; - bool one_packet_per_frame_; private: double jitter_; // TODO: FIXME: Covert time to srs_utime_t. @@ -173,14 +169,18 @@ private: uint64_t pre_number_of_packet_lossed_; uint64_t num_of_packet_received_; uint64_t number_of_packet_lossed_; -private: +protected: + SrsRtpRingBuffer* queue_; + uint64_t nn_collected_frames; std::vector > frames_; + const char* tag_; +private: bool request_key_frame_; public: - SrsRtpQueue(size_t capacity = 1024, bool one_packet_per_frame = false); + SrsRtpQueue(const char* tag, int capacity); virtual ~SrsRtpQueue(); public: - srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); // TODO: FIXME: Should merge FU-A to RAW, then we can return RAW payloads. void collect_frames(std::vector >& frames); bool should_request_key_frame(); @@ -194,7 +194,32 @@ public: uint32_t get_interarrival_jitter(); private: void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end); - void collect_packet(SrsRtpNackForReceiver* nack); +protected: + virtual void collect_packet(SrsRtpNackForReceiver* nack) = 0; +}; + +class SrsRtpAudioQueue : public SrsRtpQueue +{ +public: + SrsRtpAudioQueue(int capacity); + virtual ~SrsRtpAudioQueue(); +public: + virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); +protected: + virtual void collect_packet(SrsRtpNackForReceiver* nack); +}; + +class SrsRtpVideoQueue : public SrsRtpQueue +{ +public: + SrsRtpVideoQueue(int capacity); + virtual ~SrsRtpVideoQueue(); +public: + virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); +protected: + virtual void collect_packet(SrsRtpNackForReceiver* nack); +private: + virtual void do_collect_packet(SrsRtpNackForReceiver* nack, std::vector& frame); }; #endif diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index a50fe7781..c21c9157b 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -409,7 +409,7 @@ srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf) // Try to parse the NALU type for video decoder. if (!buf->empty()) { - nalu_type = SrsAvcNaluType((uint8_t)(buf->head()[0] & 0x3f)); + nalu_type = SrsAvcNaluType((uint8_t)(buf->head()[0] & kNalTypeMask)); } // If user set the decode handler, call it to set the payload. @@ -608,6 +608,42 @@ SrsRtpSTAPPayload::~SrsRtpSTAPPayload() } } +SrsSample* SrsRtpSTAPPayload::get_sps() +{ + int nn_nalus = (int)nalus.size(); + for (int i = 0; i < nn_nalus; i++) { + SrsSample* p = nalus[i]; + if (!p || !p->size) { + continue; + } + + SrsAvcNaluType nalu_type = (SrsAvcNaluType)(p->bytes[0] & kNalTypeMask); + if (nalu_type == SrsAvcNaluTypeSPS) { + return p; + } + } + + return NULL; +} + +SrsSample* SrsRtpSTAPPayload::get_pps() +{ + int nn_nalus = (int)nalus.size(); + for (int i = 0; i < nn_nalus; i++) { + SrsSample* p = nalus[i]; + if (!p || !p->size) { + continue; + } + + SrsAvcNaluType nalu_type = (SrsAvcNaluType)(p->bytes[0] & kNalTypeMask); + if (nalu_type == SrsAvcNaluTypePPS) { + return p; + } + } + + return NULL; +} + int SrsRtpSTAPPayload::nb_bytes() { int size = 1; @@ -658,7 +694,7 @@ srs_error_t SrsRtpSTAPPayload::decode(SrsBuffer* buf) // STAP header, RTP payload format for aggregation packets // @see https://tools.ietf.org/html/rfc6184#section-5.7 uint8_t v = buf->read_1bytes(); - nri = SrsAvcNaluType(v & kNalTypeMask); + nri = SrsAvcNaluType(v & (~kNalTypeMask)); // NALUs. while (!buf->empty()) { @@ -754,13 +790,13 @@ srs_error_t SrsRtpFUAPayload::decode(SrsBuffer* buf) // FU indicator, @see https://tools.ietf.org/html/rfc6184#section-5.8 uint8_t v = buf->read_1bytes(); - nri = SrsAvcNaluType(v & kNalTypeMask); + nri = SrsAvcNaluType(v & (~kNalTypeMask)); // FU header, @see https://tools.ietf.org/html/rfc6184#section-5.8 v = buf->read_1bytes(); start = v & kStart; end = v & kEnd; - nalu_type = SrsAvcNaluType(v & 0x3f); + nalu_type = SrsAvcNaluType(v & kNalTypeMask); if (!buf->require(1)) { return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 1); @@ -841,7 +877,7 @@ srs_error_t SrsRtpFUAPayload2::decode(SrsBuffer* buf) v = buf->read_1bytes(); start = v & kStart; end = v & kEnd; - nalu_type = SrsAvcNaluType(v & 0x3f); + nalu_type = SrsAvcNaluType(v & kNalTypeMask); if (!buf->require(1)) { return srs_error_new(ERROR_RTC_RTP_MUXER, "requires %d bytes", 1); diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index c587113c8..fd38a4d12 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -214,6 +214,9 @@ public: public: SrsRtpSTAPPayload(); virtual ~SrsRtpSTAPPayload(); +public: + SrsSample* get_sps(); + SrsSample* get_pps(); // interface ISrsEncoder public: virtual int nb_bytes(); From 9906d2e8594463fcc66746658249c7e13d8b3664 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 07:22:07 +0800 Subject: [PATCH 39/79] Refine RTC publish SDP, remove SSRC because it's recvonly. --- trunk/src/app/srs_app_http_api.cpp | 27 +++++++++++---------------- trunk/src/app/srs_app_rtc_conn.cpp | 18 ++++++++---------- trunk/src/app/srs_app_rtc_conn.hpp | 3 ++- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index f836b1bc8..d84930a81 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace std; #include @@ -994,7 +995,7 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_sdp.addrtype_ = "IP4"; local_sdp.unicast_address_ = "0.0.0.0"; - local_sdp.session_name_ = "live_play_session"; + local_sdp.session_name_ = "SRSPlaySession"; local_sdp.msid_semantic_ = "WMS"; local_sdp.msids_.push_back(app + "/" + stream); @@ -1088,6 +1089,10 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_media_desc.rtcp_mux_ = true; local_media_desc.rtcp_rsize_ = true; + if (!ssrc_num) { + ssrc_num = ::getpid() * 10000 + ::getpid() * 100 + ::getpid(); + } + if (local_media_desc.sendonly_ || local_media_desc.sendrecv_) { SrsSSRCInfo ssrc_info; ssrc_info.ssrc_ = ++ssrc_num; @@ -1298,7 +1303,7 @@ srs_error_t SrsGoApiRtcPublish::exchange_sdp(const std::string& app, const std:: local_sdp.addrtype_ = "IP4"; local_sdp.unicast_address_ = "0.0.0.0"; - local_sdp.session_name_ = "live_publish_session"; + local_sdp.session_name_ = "SRSPublishSession"; local_sdp.msid_semantic_ = "WMS"; local_sdp.msids_.push_back(app + "/" + stream); @@ -1385,23 +1390,13 @@ srs_error_t SrsGoApiRtcPublish::exchange_sdp(const std::string& app, const std:: } local_sdp.media_descs_.back().session_info_.ice_options_ = "trickle"; - - if (remote_media_desc.sendonly_) { - local_media_desc.recvonly_ = true; - } else if (remote_media_desc.recvonly_) { - local_media_desc.sendonly_ = true; - } else if (remote_media_desc.sendrecv_) { - local_media_desc.sendrecv_ = true; - } local_media_desc.rtcp_mux_ = true; - if (local_media_desc.recvonly_ || local_media_desc.sendrecv_) { - SrsSSRCInfo ssrc_info; - ssrc_info.ssrc_ = ++ssrc_num; - ssrc_info.cname_ = "test_sdp_cname"; - local_media_desc.ssrc_infos_.push_back(ssrc_info); - } + // For publisher, we are always sendonly. + local_media_desc.sendonly_ = false; + local_media_desc.recvonly_ = true; + local_media_desc.sendrecv_ = false; } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 5c58a2667..d2212cff9 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -749,6 +749,7 @@ srs_error_t SrsRtcSenderThread::cycle() ::getpid(), source->source_id(), rtc_session->encrypt, realtime, srsu2msi(mw_sleep), mw_msgs); // For RTC, notify the source to fetch keyframe for this client. + // TODO: FIXME: Should triggle by PLI from client. source->request_keyframe(); SrsMessageArray msgs(SRS_PERF_MW_MSGS); @@ -2240,7 +2241,7 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t return err; } -SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id) +SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, bool is_publisher, const std::string& un, int context_id) { username = un; req = r->copy(); @@ -2250,6 +2251,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& source = NULL; publisher = NULL; sender = NULL; + is_publisher_ = is_publisher; sendonly_skt = NULL; rtc_server = s; dtls_session = new SrsDtlsSession(this); @@ -2522,17 +2524,14 @@ srs_error_t SrsRtcSession::on_connection_established() { srs_error_t err = srs_success; - srs_trace("rtc session=%s, to=%dms connection established", id().c_str(), srsu2msi(sessionStunTimeout)); + srs_trace("RTC %s session=%s, to=%dms connection established", (is_publisher_? "Publisher":"Subscriber"), + id().c_str(), srsu2msi(sessionStunTimeout)); - if (!local_sdp.media_descs_.empty() && - (local_sdp.media_descs_.back().recvonly_ || local_sdp.media_descs_.back().sendrecv_)) { + if (is_publisher_) { if ((err = start_publish()) != srs_success) { return srs_error_wrap(err, "start publish"); } - } - - if (!local_sdp.media_descs_.empty() && - (local_sdp.media_descs_.back().sendonly_ || local_sdp.media_descs_.back().sendrecv_)) { + } else { if ((err = start_play()) != srs_success) { return srs_error_wrap(err, "start play"); } @@ -2580,7 +2579,6 @@ srs_error_t SrsRtcSession::start_publish() srs_freep(publisher); publisher = new SrsRtcPublisher(this); - publisher->request_keyframe(); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -3361,7 +3359,7 @@ srs_error_t SrsRtcServer::create_rtc_session( } int cid = _srs_context->get_id(); - SrsRtcSession* session = new SrsRtcSession(this, req, username, cid); + SrsRtcSession* session = new SrsRtcSession(this, req, publish, username, cid); if ((err = session->initialize()) != srs_success) { srs_freep(session); return srs_error_wrap(err, "init"); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 7d1abae90..0623e56ea 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -311,6 +311,7 @@ private: SrsDtlsSession* dtls_session; SrsRtcSenderThread* sender; SrsRtcPublisher* publisher; + bool is_publisher_; private: SrsUdpMuxSocket* sendonly_skt; std::string username; @@ -336,7 +337,7 @@ private: sockaddr_in* blackhole_addr; srs_netfd_t blackhole_stfd; public: - SrsRtcSession(SrsRtcServer* s, SrsRequest* r, const std::string& un, int context_id); + SrsRtcSession(SrsRtcServer* s, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); virtual ~SrsRtcSession(); public: SrsSdp* get_local_sdp(); From 20b4984af4afd20fba7e1c2ff5c036e103959796 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 07:43:05 +0800 Subject: [PATCH 40/79] Refine consumer dumps, extract dumps API --- trunk/src/app/srs_app_http_api.cpp | 1 + trunk/src/app/srs_app_http_stream.cpp | 17 +++++++++++------ trunk/src/app/srs_app_rtc_conn.cpp | 6 +++++- trunk/src/app/srs_app_rtmp_conn.cpp | 5 ++++- trunk/src/app/srs_app_source.cpp | 27 +++++++++++++++++---------- trunk/src/app/srs_app_source.hpp | 6 ++++-- 6 files changed, 42 insertions(+), 20 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index d84930a81..6394f7037 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1089,6 +1089,7 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str local_media_desc.rtcp_mux_ = true; local_media_desc.rtcp_rsize_ = true; + // TODO: FIXME: Avoid SSRC collision. if (!ssrc_num) { ssrc_num = ::getpid() * 10000 + ::getpid() * 100 + ::getpid(); } diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index 95a67c21a..4afe83f3e 100755 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -128,10 +128,13 @@ srs_error_t SrsBufferCache::cycle() // the stream cache will create consumer to cache stream, // which will trigger to fetch stream from origin for edge. SrsConsumer* consumer = NULL; - if ((err = source->create_consumer(NULL, consumer, false, false, true)) != srs_success) { + SrsAutoFree(SrsConsumer, consumer); + if ((err = source->create_consumer(NULL, consumer)) != srs_success) { return srs_error_wrap(err, "create consumer"); } - SrsAutoFree(SrsConsumer, consumer); + if ((err = source->consumer_dumps(consumer, false, false, true)) != srs_success) { + return srs_error_wrap(err, "dumps consumer"); + } SrsPithyPrint* pprint = SrsPithyPrint::create_http_stream_cache(); SrsAutoFree(SrsPithyPrint, pprint); @@ -583,12 +586,14 @@ srs_error_t SrsLiveStream::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMess // create consumer of souce, ignore gop cache, use the audio gop cache. SrsConsumer* consumer = NULL; - if ((err = source->create_consumer(NULL, consumer, true, true, !enc->has_cache())) != srs_success) { + SrsAutoFree(SrsConsumer, consumer); + if ((err = source->create_consumer(NULL, consumer)) != srs_success) { return srs_error_wrap(err, "create consumer"); } - SrsAutoFree(SrsConsumer, consumer); - srs_verbose("http: consumer created success."); - + if ((err = source->consumer_dumps(consumer, true, true, !enc->has_cache())) != srs_success) { + return srs_error_wrap(err, "dumps consumer"); + } + SrsPithyPrint* pprint = SrsPithyPrint::create_http_stream(); SrsAutoFree(SrsPithyPrint, pprint); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index d2212cff9..efe93ff9f 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -721,7 +721,6 @@ srs_error_t SrsRtcSenderThread::cycle() SrsConsumer* consumer = NULL; SrsAutoFree(SrsConsumer, consumer); - // TODO: FIXME: Dumps the SPS/PPS from gop cache, without other frames. if ((err = source->create_consumer(NULL, consumer)) != srs_success) { return srs_error_wrap(err, "rtc create consumer, source url=%s", req->get_stream_url().c_str()); } @@ -733,6 +732,11 @@ srs_error_t SrsRtcSenderThread::cycle() // messages and drop them if the shared sender queue is full. consumer->enable_pass_timestamp(); + // TODO: FIXME: Dumps the SPS/PPS from gop cache, without other frames. + if ((err = source->consumer_dumps(consumer)) != srs_success) { + return srs_error_wrap(err, "dumps consumer, source url=%s", req->get_stream_url().c_str()); + } + realtime = _srs_config->get_realtime_enabled(req->vhost, true); mw_sleep = _srs_config->get_mw_sleep(req->vhost, true); mw_msgs = _srs_config->get_mw_msgs(req->vhost, realtime, true); diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index 0f8b1012a..4bcf0622e 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -654,10 +654,13 @@ srs_error_t SrsRtmpConn::playing(SrsSource* source) // Create a consumer of source. SrsConsumer* consumer = NULL; + SrsAutoFree(SrsConsumer, consumer); if ((err = source->create_consumer(this, consumer)) != srs_success) { return srs_error_wrap(err, "rtmp: create consumer"); } - SrsAutoFree(SrsConsumer, consumer); + if ((err = source->consumer_dumps(consumer)) != srs_success) { + return srs_error_wrap(err, "rtmp: dumps consumer"); + } // Use receiving thread to receive packets from peer. // @see: https://github.com/ossrs/srs/issues/217 diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 651801600..9fe1e2cdc 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -2594,12 +2594,27 @@ void SrsSource::on_unpublish() } } -srs_error_t SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool ds, bool dm, bool dg) +srs_error_t SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consumer) { srs_error_t err = srs_success; consumer = new SrsConsumer(this, conn); consumers.push_back(consumer); + + // for edge, when play edge stream, check the state + if (_srs_config->get_vhost_is_edge(req->vhost)) { + // notice edge to start for the first client. + if ((err = play_edge->on_client_play()) != srs_success) { + return srs_error_wrap(err, "play edge"); + } + } + + return err; +} + +srs_error_t SrsSource::consumer_dumps(SrsConsumer* consumer, bool ds, bool dm, bool dg) +{ + srs_error_t err = srs_success; srs_utime_t queue_size = _srs_config->get_queue_length(req->vhost); consumer->set_queue_size(queue_size); @@ -2636,15 +2651,7 @@ srs_error_t SrsSource::create_consumer(SrsConnection* conn, SrsConsumer*& consum } else { srs_trace("create consumer, active=%d, ignore gop cache, jitter=%d", hub->active(), jitter_algorithm); } - - // for edge, when play edge stream, check the state - if (_srs_config->get_vhost_is_edge(req->vhost)) { - // notice edge to start for the first client. - if ((err = play_edge->on_client_play()) != srs_success) { - return srs_error_wrap(err, "play edge"); - } - } - + return err; } diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 7b6a96107..1d27fdbbb 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -599,12 +599,14 @@ public: virtual srs_error_t on_publish(); virtual void on_unpublish(); public: - // Create consumer and dumps packets in cache. + // Create consumer // @param consumer, output the create consumer. + virtual srs_error_t create_consumer(SrsConnection* conn, SrsConsumer*& consumer); + // Dumps packets in cache to consumer. // @param ds, whether dumps the sequence header. // @param dm, whether dumps the metadata. // @param dg, whether dumps the gop cache. - virtual srs_error_t create_consumer(SrsConnection* conn, SrsConsumer*& consumer, bool ds = true, bool dm = true, bool dg = true); + virtual srs_error_t consumer_dumps(SrsConsumer* consumer, bool ds = true, bool dm = true, bool dg = true); virtual void on_consumer_destroy(SrsConsumer* consumer); virtual void set_cache(bool enabled); virtual SrsRtmpJitterAlgorithm jitter(); From 1688d53f7d16dff4363348565a6296b683aa92ec Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 07:51:01 +0800 Subject: [PATCH 41/79] Refine source, pass-by RTC publisher for player --- trunk/src/app/srs_app_rtc_conn.cpp | 5 ++++- trunk/src/app/srs_app_source.cpp | 10 ++++------ trunk/src/app/srs_app_source.hpp | 10 ++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index efe93ff9f..d7d39a773 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -754,7 +754,10 @@ srs_error_t SrsRtcSenderThread::cycle() // For RTC, notify the source to fetch keyframe for this client. // TODO: FIXME: Should triggle by PLI from client. - source->request_keyframe(); + SrsRtcPublisher* publisher = source->rtc_publisher(); + if (publisher) { + publisher->request_keyframe(); + } SrsMessageArray msgs(SRS_PERF_MW_MSGS); SrsRtcPackets pkts(SRS_PERF_RTC_RTP_PACKETS); diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 9fe1e2cdc..b23100f2f 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1921,7 +1921,7 @@ SrsSource::SrsSource() atc = false; #ifdef SRS_RTC - rtc_publisher = NULL; + rtc_publisher_ = NULL; #endif } @@ -2706,16 +2706,14 @@ SrsMetaCache* SrsSource::cached_meta() return meta; } -void SrsSource::request_keyframe() +SrsRtcPublisher* SrsSource::rtc_publisher() { - if (rtc_publisher) { - rtc_publisher->request_keyframe(); - } + return rtc_publisher_; } void SrsSource::set_rtc_publisher(SrsRtcPublisher* v) { - rtc_publisher = v; + rtc_publisher_ = v; } srs_error_t SrsSource::on_rtc_audio(SrsSharedPtrMessage* audio) diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 1d27fdbbb..5aba081d1 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -551,7 +551,7 @@ private: srs_utime_t die_at; #ifdef SRS_RTC private: - SrsRtcPublisher* rtc_publisher; + SrsRtcPublisher* rtc_publisher_; #endif public: SrsSource(); @@ -621,12 +621,10 @@ public: virtual std::string get_curr_origin(); #ifdef SRS_RTC public: - // Get the cached meta, as such the sps/pps. + // For RTC, we need to package SPS/PPS(in cached meta) before each IDR. SrsMetaCache* cached_meta(); - // Request keyframe for new client. - // TODO: FIXME: Maybe we could cache the keyframe. - // TODO: FIXME: Maybe we should only response for the new clients. - void request_keyframe(); + // Get and set the publisher, passed to consumer to process requests such as PLI. + SrsRtcPublisher* rtc_publisher(); void set_rtc_publisher(SrsRtcPublisher* v); // When got RTC audio message, which is encoded in opus. // TODO: FIXME: Merge with on_audio. From 5fb7c4efbc56392cfdc70a98c2472387ff1e8f09 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 09:00:05 +0800 Subject: [PATCH 42/79] RTC supports pass-by players PLI to publisher --- trunk/src/app/srs_app_http_api.cpp | 2 +- trunk/src/app/srs_app_rtc_conn.cpp | 27 ++++++++++++++++----------- trunk/src/app/srs_app_rtc_conn.hpp | 4 ++-- trunk/src/app/srs_app_sdp.cpp | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 6394f7037..50ca4a328 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1246,7 +1246,7 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt string local_sdp_str = os.str(); - srs_trace("local_sdp=%s", local_sdp_str.c_str()); + srs_verbose("local_sdp=%s", local_sdp_str.c_str()); res->set("code", SrsJsonAny::integer(ERROR_SUCCESS)); res->set("server", SrsJsonAny::integer(SrsStatistic::instance()->server_id())); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index d7d39a773..66438e847 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -752,13 +752,6 @@ srs_error_t SrsRtcSenderThread::cycle() srs_trace("RTC source url=%s, source_id=[%d][%d], encrypt=%d, realtime=%d, mw_sleep=%dms, mw_msgs=%d", req->get_stream_url().c_str(), ::getpid(), source->source_id(), rtc_session->encrypt, realtime, srsu2msi(mw_sleep), mw_msgs); - // For RTC, notify the source to fetch keyframe for this client. - // TODO: FIXME: Should triggle by PLI from client. - SrsRtcPublisher* publisher = source->rtc_publisher(); - if (publisher) { - publisher->request_keyframe(); - } - SrsMessageArray msgs(SRS_PERF_MW_MSGS); SrsRtcPackets pkts(SRS_PERF_RTC_RTP_PACKETS); @@ -1864,6 +1857,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(uint32_t ssrc) srs_trace("RTC PLI ssrc=%u", ssrc); + if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + // Ignore any error for black-hole. + void* p = stream.data(); int len = stream.pos(); SrsRtcSession* s = rtc_session; + srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); + } + char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { @@ -2248,14 +2247,14 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t return err; } -SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsRequest* r, bool is_publisher, const std::string& un, int context_id) +SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id) { username = un; req = r->copy(); cid = context_id; encrypt = true; - source = NULL; + source_ = source; publisher = NULL; sender = NULL; is_publisher_ = is_publisher; @@ -2586,6 +2585,8 @@ srs_error_t SrsRtcSession::start_publish() srs_freep(publisher); publisher = new SrsRtcPublisher(this); + // Request PLI for exists players? + //publisher->request_keyframe(); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2793,7 +2794,11 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf) switch (fmt) { case kPLI: { - srs_verbose("pli"); + SrsRtcPublisher* publisher = source_->rtc_publisher(); + if (publisher) { + publisher->request_keyframe(); + } + srs_trace("RTC request PLI"); break; } case kSLI: { @@ -3366,7 +3371,7 @@ srs_error_t SrsRtcServer::create_rtc_session( } int cid = _srs_context->get_id(); - SrsRtcSession* session = new SrsRtcSession(this, req, publish, username, cid); + SrsRtcSession* session = new SrsRtcSession(this, source, req, publish, username, cid); if ((err = session->initialize()) != srs_success) { srs_freep(session); return srs_error_wrap(err, "init"); diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 0623e56ea..155536131 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -329,7 +329,7 @@ private: // TODO: FIXME: Support reload. bool encrypt; SrsRequest* req; - SrsSource* source; + SrsSource* source_; SrsSdp remote_sdp; SrsSdp local_sdp; private: @@ -337,7 +337,7 @@ private: sockaddr_in* blackhole_addr; srs_netfd_t blackhole_stfd; public: - SrsRtcSession(SrsRtcServer* s, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); + SrsRtcSession(SrsRtcServer* s, SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); virtual ~SrsRtcSession(); public: SrsSdp* get_local_sdp(); diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index 4cce5295a..9fc227be6 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -373,7 +373,7 @@ srs_error_t SrsMediaDesc::encode(std::ostringstream& os) << " typ " << iter->type_ << " generation 0" << kCRLF; - srs_trace("local SDP candidate line=%s", os.str().c_str()); + srs_verbose("local SDP candidate line=%s", os.str().c_str()); } return err; From 157bc713a9a68132c9115ac6b09b183a1adcafb7 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 09:55:43 +0800 Subject: [PATCH 43/79] Refactor RTC session API --- trunk/src/app/srs_app_rtc_conn.cpp | 26 +++++++++++++++----------- trunk/src/app/srs_app_rtc_conn.hpp | 4 ++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 66438e847..981a034b0 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -2247,17 +2247,16 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t return err; } -SrsRtcSession::SrsRtcSession(SrsRtcServer* s, SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id) +SrsRtcSession::SrsRtcSession(SrsRtcServer* s) { - username = un; - req = r->copy(); - cid = context_id; + req = NULL; + cid = 0; + is_publisher_ = false; encrypt = true; - source_ = source; + source_ = NULL; publisher = NULL; sender = NULL; - is_publisher_ = is_publisher; sendonly_skt = NULL; rtc_server = s; dtls_session = new SrsDtlsSession(this); @@ -2343,10 +2342,16 @@ int SrsRtcSession::context_id() return cid; } -srs_error_t SrsRtcSession::initialize() +srs_error_t SrsRtcSession::initialize(SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id) { srs_error_t err = srs_success; + username = un; + req = r->copy(); + cid = context_id; + is_publisher_ = is_publisher; + source_ = source; + if ((err = dtls_session->initialize(req)) != srs_success) { return srs_error_wrap(err, "init"); } @@ -2786,7 +2791,6 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf) //uint8_t padding = first & 0x20; uint8_t fmt = first & 0x1F; - // TODO: FIXME: Dead code? /*uint8_t payload_type = */stream->read_1bytes(); /*uint16_t length = */stream->read_2bytes(); /*uint32_t ssrc_of_sender = */stream->read_4bytes(); @@ -2797,8 +2801,8 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf) SrsRtcPublisher* publisher = source_->rtc_publisher(); if (publisher) { publisher->request_keyframe(); + srs_trace("RTC request PLI"); } - srs_trace("RTC request PLI"); break; } case kSLI: { @@ -3371,8 +3375,8 @@ srs_error_t SrsRtcServer::create_rtc_session( } int cid = _srs_context->get_id(); - SrsRtcSession* session = new SrsRtcSession(this, source, req, publish, username, cid); - if ((err = session->initialize()) != srs_success) { + SrsRtcSession* session = new SrsRtcSession(this); + if ((err = session->initialize(source, req, publish, username, cid)) != srs_success) { srs_freep(session); return srs_error_wrap(err, "init"); } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 155536131..290d405c8 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -337,7 +337,7 @@ private: sockaddr_in* blackhole_addr; srs_netfd_t blackhole_stfd; public: - SrsRtcSession(SrsRtcServer* s, SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); + SrsRtcSession(SrsRtcServer* s); virtual ~SrsRtcSession(); public: SrsSdp* get_local_sdp(); @@ -353,7 +353,7 @@ public: void switch_to_context(); int context_id(); public: - srs_error_t initialize(); + srs_error_t initialize(SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); // The peer address may change, we can identify that by STUN messages. srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r); srs_error_t on_dtls(char* data, int nb_data); From 32c4febafe648ea1667f3411e49fbb567bf37dc8 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 10:15:54 +0800 Subject: [PATCH 44/79] Refactor RTC publish packet flags. --- trunk/src/app/srs_app_rtc_conn.cpp | 18 +++--- trunk/src/app/srs_app_rtc_conn.hpp | 8 +-- trunk/src/app/srs_app_rtp_queue.cpp | 85 ++++++++++++++++------------- trunk/src/app/srs_app_rtp_queue.hpp | 19 ++++--- trunk/src/kernel/srs_kernel_rtp.cpp | 6 +- trunk/src/kernel/srs_kernel_rtp.hpp | 8 +-- 6 files changed, 77 insertions(+), 67 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 981a034b0..34dad0f46 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1924,10 +1924,6 @@ void SrsRtcPublisher::on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* bu srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) { - pkt->is_first_packet_of_frame = true; - pkt->is_last_packet_of_frame = true; - pkt->is_key_frame = true; - // TODO: FIXME: Error check. audio_queue_->consume(audio_nack_, pkt); @@ -2005,17 +2001,17 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); } - pkt->is_first_packet_of_frame = payload->start; - pkt->is_last_packet_of_frame = payload->end; - pkt->is_key_frame = (payload->nalu_type == SrsAvcNaluTypeIDR); + pkt->video_is_first_packet = payload->start; + pkt->video_is_last_packet = payload->end; + pkt->video_is_idr = (payload->nalu_type == SrsAvcNaluTypeIDR); } else { - pkt->is_first_packet_of_frame = true; - pkt->is_last_packet_of_frame = true; + pkt->video_is_first_packet = true; + pkt->video_is_last_packet = true; if (v == kStapA) { - pkt->is_key_frame = true; + pkt->video_is_idr = true; } else { - pkt->is_key_frame = (pkt->nalu_type == SrsAvcNaluTypeIDR); + pkt->video_is_idr = (pkt->nalu_type == SrsAvcNaluTypeIDR); } } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 290d405c8..3f4018644 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -53,8 +53,8 @@ class SrsSource; class SrsRtpPacket2; class ISrsUdpSender; class SrsRtpQueue; -class SrsRtpH264Demuxer; -class SrsRtpOpusDemuxer; +class SrsRtpAudioQueue; +class SrsRtpVideoQueue; class SrsRtpPacket2; class ISrsCodec; class SrsRtpNackForReceiver; @@ -261,9 +261,9 @@ private: uint32_t video_ssrc; uint32_t audio_ssrc; private: - SrsRtpQueue* video_queue_; + SrsRtpVideoQueue* video_queue_; SrsRtpNackForReceiver* video_nack_; - SrsRtpQueue* audio_queue_; + SrsRtpAudioQueue* audio_queue_; SrsRtpNackForReceiver* audio_nack_; private: SrsRequest* req; diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 5adef6e95..b685cebce 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -200,7 +200,7 @@ uint16_t SrsRtpRingBuffer::next_start_of_frame() for (uint16_t s = low_ + 1 ; s != high_; ++s) { SrsRtpPacket2*& pkt = queue_[s % capacity_]; - if (pkt && pkt->is_first_packet_of_frame) { + if (pkt && pkt->video_is_first_packet) { return s; } } @@ -216,7 +216,7 @@ uint16_t SrsRtpRingBuffer::next_keyframe() for (uint16_t s = low_ + 1 ; s != high_; ++s) { SrsRtpPacket2*& pkt = queue_[s % capacity_]; - if (pkt && pkt->is_key_frame && pkt->is_first_packet_of_frame) { + if (pkt && pkt->video_is_idr && pkt->video_is_first_packet) { return s; } } @@ -283,7 +283,6 @@ SrsRtpQueue::SrsRtpQueue(const char* tag, int capacity) num_of_packet_received_ = 0; number_of_packet_lossed_ = 0; - request_key_frame_ = false; tag_ = tag; } @@ -337,23 +336,7 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt // When packets overflow, collect frame and move head to next frame start. if (queue_->overflow()) { - collect_packet(nack); - - uint16_t next = queue_->next_start_of_frame(); - - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - srs_trace("%s seq out of range [%u, %u]", tag_, queue_->low(), next); - - for (uint16_t s = queue_->low(); s != next; ++s) { - nack->remove(s); - queue_->remove(s); - } - - srs_trace("%s force update seq %u to %u", tag_, queue_->low(), next + 1); - queue_->advance_to(next + 1); + on_overflow(nack); } // Save packet at the position seq. @@ -367,16 +350,6 @@ void SrsRtpQueue::collect_frames(std::vector >& fram frames.swap(frames_); } -bool SrsRtpQueue::should_request_key_frame() -{ - if (request_key_frame_) { - request_key_frame_ = false; - return true; - } - - return request_key_frame_; -} - void SrsRtpQueue::notify_drop_seq(uint16_t seq) { uint16_t next = queue_->next_start_of_frame(); @@ -405,11 +378,6 @@ void SrsRtpQueue::notify_nack_list_full() queue_->advance_to(next + 1); } -void SrsRtpQueue::request_keyframe() -{ - request_key_frame_ = true; -} - uint32_t SrsRtpQueue::get_extended_highest_sequence() { return queue_->get_extended_highest_sequence(); @@ -471,6 +439,12 @@ srs_error_t SrsRtpAudioQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2 return err; } +void SrsRtpAudioQueue::on_overflow(SrsRtpNackForReceiver* nack) +{ + collect_packet(nack); + queue_->advance_to(queue_->high()); +} + void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) { // When done, s point to the next available packet. @@ -505,6 +479,7 @@ void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) SrsRtpVideoQueue::SrsRtpVideoQueue(int capacity) : SrsRtpQueue("video", capacity) { + request_key_frame_ = false; } SrsRtpVideoQueue::~SrsRtpVideoQueue() @@ -530,6 +505,42 @@ srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2 return err; } +bool SrsRtpVideoQueue::should_request_key_frame() +{ + if (request_key_frame_) { + request_key_frame_ = false; + return true; + } + + return request_key_frame_; +} + +void SrsRtpVideoQueue::request_keyframe() +{ + request_key_frame_ = true; +} + +void SrsRtpVideoQueue::on_overflow(SrsRtpNackForReceiver* nack) +{ + collect_packet(nack); + + uint16_t next = queue_->next_start_of_frame(); + + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; + } + srs_trace("%s seq out of range [%u, %u]", tag_, queue_->low(), next); + + for (uint16_t s = queue_->low(); s != next; ++s) { + nack->remove(s); + queue_->remove(s); + } + + srs_trace("%s force update seq %u to %u", tag_, queue_->low(), next + 1); + queue_->advance_to(next + 1); +} + void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack) { while (queue_->low() != queue_->high()) { @@ -563,7 +574,7 @@ void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vectorlow() && !pkt->is_first_packet_of_frame) { + if (next == queue_->low() && !pkt->video_is_first_packet) { break; } @@ -572,7 +583,7 @@ void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vectorrtp_header.get_marker() || pkt->is_last_packet_of_frame) { + if (pkt->rtp_header.get_marker() || pkt->video_is_last_packet) { found = true; next++; break; diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index cb14a3d19..07472d6de 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -144,11 +144,11 @@ public: // Whether queue overflow or heavy(too many packets and need clear). bool overflow(); bool is_heavy(); - // Get the next start packet of frame. + // For video, get the next start packet of frame. // @remark If not found, return the low_, which should never be the "next" one, // because it MAY or NOT current start packet of frame but never be the next. uint16_t next_start_of_frame(); - // Get the next seq of keyframe. + // For video, get the next seq of keyframe. // @remark Return low_ if not found. uint16_t next_keyframe(); // The highest sequence number, calculate the flip back base. @@ -174,8 +174,6 @@ protected: uint64_t nn_collected_frames; std::vector > frames_; const char* tag_; -private: - bool request_key_frame_; public: SrsRtpQueue(const char* tag, int capacity); virtual ~SrsRtpQueue(); @@ -183,10 +181,8 @@ public: virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); // TODO: FIXME: Should merge FU-A to RAW, then we can return RAW payloads. void collect_frames(std::vector >& frames); - bool should_request_key_frame(); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); - void request_keyframe(); public: uint32_t get_extended_highest_sequence(); uint8_t get_fraction_lost(); @@ -195,7 +191,7 @@ public: private: void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end); protected: - virtual void collect_packet(SrsRtpNackForReceiver* nack) = 0; + virtual void on_overflow(SrsRtpNackForReceiver* nack) = 0; }; class SrsRtpAudioQueue : public SrsRtpQueue @@ -205,20 +201,27 @@ public: virtual ~SrsRtpAudioQueue(); public: virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); +private: + virtual void on_overflow(SrsRtpNackForReceiver* nack); protected: virtual void collect_packet(SrsRtpNackForReceiver* nack); }; class SrsRtpVideoQueue : public SrsRtpQueue { +private: + bool request_key_frame_; public: SrsRtpVideoQueue(int capacity); virtual ~SrsRtpVideoQueue(); public: virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + bool should_request_key_frame(); + void request_keyframe(); protected: - virtual void collect_packet(SrsRtpNackForReceiver* nack); + virtual void on_overflow(SrsRtpNackForReceiver* nack); private: + virtual void collect_packet(SrsRtpNackForReceiver* nack); virtual void do_collect_packet(SrsRtpNackForReceiver* nack, std::vector& frame); }; diff --git a/trunk/src/kernel/srs_kernel_rtp.cpp b/trunk/src/kernel/srs_kernel_rtp.cpp index c21c9157b..a27b2cdd4 100644 --- a/trunk/src/kernel/srs_kernel_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtp.cpp @@ -277,9 +277,9 @@ SrsRtpPacket2::SrsRtpPacket2() payload = NULL; decode_handler = NULL; - is_first_packet_of_frame = false; - is_last_packet_of_frame = false; - is_key_frame = false; + video_is_first_packet = false; + video_is_last_packet = false; + video_is_idr = false; nalu_type = SrsAvcNaluTypeReserved; cache_raw = new SrsRtpRawPayload(); diff --git a/trunk/src/kernel/srs_kernel_rtp.hpp b/trunk/src/kernel/srs_kernel_rtp.hpp index fd38a4d12..baaeb0281 100644 --- a/trunk/src/kernel/srs_kernel_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtp.hpp @@ -114,10 +114,10 @@ public: int padding; // Decoder helper. public: - // Helper information for decoder. - bool is_first_packet_of_frame; - bool is_last_packet_of_frame; - bool is_key_frame; + // Helper information for video decoder only. + bool video_is_first_packet; + bool video_is_last_packet; + bool video_is_idr; // The first byte as nalu type, for video decoder only. SrsAvcNaluType nalu_type; // The original payload bytes length. From 2a0562da5e3202448e90a4d51f21bddd9a908e1d Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 11:14:11 +0800 Subject: [PATCH 45/79] Refine RTC, disable NASM, SENDMMSG, SRTP-NASM --- trunk/3rdparty/st-srs/io.c | 10 +++++--- trunk/3rdparty/st-srs/public.h | 4 +-- trunk/auto/auto_headers.sh | 5 ---- trunk/auto/depends.sh | 2 +- trunk/auto/options.sh | 37 +++------------------------- trunk/src/app/srs_app_config.cpp | 2 +- trunk/src/app/srs_app_listener.hpp | 4 +-- trunk/src/app/srs_app_rtc_conn.cpp | 22 ++++++++--------- trunk/src/app/srs_app_rtc_conn.hpp | 10 ++++---- trunk/src/protocol/srs_sip_stack.cpp | 6 ++--- trunk/src/service/srs_service_st.cpp | 8 +++--- trunk/src/service/srs_service_st.hpp | 16 ++++++------ 12 files changed, 44 insertions(+), 82 deletions(-) diff --git a/trunk/3rdparty/st-srs/io.c b/trunk/3rdparty/st-srs/io.c index f4345aa89..35a3110c6 100644 --- a/trunk/3rdparty/st-srs/io.c +++ b/trunk/3rdparty/st-srs/io.c @@ -743,16 +743,18 @@ int st_sendmsg(_st_netfd_t *fd, const struct msghdr *msg, int flags, st_utime_t } -#if defined(MD_HAVE_SENDMMSG) && defined(__linux__) && defined(_GNU_SOURCE) -int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout) +int st_sendmmsg(st_netfd_t fd, void *msgvec, unsigned int vlen, int flags, st_utime_t timeout) { +#if !defined(MD_HAVE_SENDMMSG) || !defined(_GNU_SOURCE) + return -1; +#else int n; int left; struct mmsghdr *p; left = (int)vlen; while (left > 0) { - p = msgvec + (vlen - left); + p = (struct mmsghdr*)msgvec + (vlen - left); if ((n = sendmmsg(fd->osfd, p, left, flags)) < 0) { if (errno == EINTR) @@ -772,8 +774,8 @@ int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int fl return n; } return (int)vlen - left; -} #endif +} /* diff --git a/trunk/3rdparty/st-srs/public.h b/trunk/3rdparty/st-srs/public.h index 332f3291c..a581adc08 100644 --- a/trunk/3rdparty/st-srs/public.h +++ b/trunk/3rdparty/st-srs/public.h @@ -151,9 +151,7 @@ extern int st_recvfrom(st_netfd_t fd, void *buf, int len, struct sockaddr *from, extern int st_sendto(st_netfd_t fd, const void *msg, int len, const struct sockaddr *to, int tolen, st_utime_t timeout); extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, st_utime_t timeout); extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, st_utime_t timeout); -#if defined(__linux__) && defined(_GNU_SOURCE) -extern int st_sendmmsg(st_netfd_t fd, struct mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout); -#endif +extern int st_sendmmsg(st_netfd_t fd, void *msgvec, unsigned int vlen, int flags, st_utime_t timeout); extern st_netfd_t st_open(const char *path, int oflags, mode_t mode); #ifdef DEBUG diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index bcbfe95b8..772d0aeba 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -165,11 +165,6 @@ if [ $SRS_SENDMMSG = YES ]; then else srs_undefine_macro "SRS_SENDMMSG" $SRS_AUTO_HEADERS_H fi -if [ $SRS_HAS_SENDMMSG = YES ]; then - srs_define_macro "SRS_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H -else - srs_undefine_macro "SRS_HAS_SENDMMSG" $SRS_AUTO_HEADERS_H -fi if [ $SRS_DEBUG = YES ]; then srs_define_macro "SRS_DEBUG" $SRS_AUTO_HEADERS_H diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index f9723193f..484ba2567 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -347,7 +347,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_LD=${SRS_TOOL_CC} && _ST_OBJ="DARWIN_`uname -r`_DBG" fi # For UDP sendmmsg, disable it if not suppported. - if [[ $SRS_HAS_SENDMMSG == YES ]]; then + if [[ $SRS_SENDMMSG == YES ]]; then echo "Build ST with UDP sendmmsg support." _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_HAVE_SENDMMSG -D_GNU_SOURCE" else diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index cd7cfe8e4..a5848485b 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -118,11 +118,9 @@ SRS_EXTRA_FLAGS= # ##################################################################################### # Performance optimize. -SRS_NASM=YES -SRS_SRTP_ASM=YES -SRS_SENDMMSG=YES -SRS_HAS_SENDMMSG=YES -SRS_DETECT_SENDMMSG=YES +SRS_NASM=NO +SRS_SRTP_ASM=NO +SRS_SENDMMSG=NO SRS_DEBUG=NO ##################################################################################### @@ -257,8 +255,6 @@ function parse_user_option() { --export-librtmp-project) SRS_EXPORT_LIBRTMP_PROJECT=${value} ;; --export-librtmp-single) SRS_EXPORT_LIBRTMP_SINGLE=${value} ;; - --detect-sendmmsg) if [[ $value == off ]]; then SRS_DETECT_SENDMMSG=NO; else SRS_DETECT_SENDMMSG=YES; fi ;; - --has-sendmmsg) if [[ $value == off ]]; then SRS_HAS_SENDMMSG=NO; else SRS_HAS_SENDMMSG=YES; fi ;; --sendmmsg) if [[ $value == off ]]; then SRS_SENDMMSG=NO; else SRS_SENDMMSG=YES; fi ;; --without-srtp-nasm) SRS_SRTP_ASM=NO ;; @@ -612,31 +608,6 @@ function apply_user_detail_options() { echo "Disable SRTP ASM, because NASM is disabled." SRS_SRTP_ASM=NO fi - - # Detect whether has sendmmsg. - # @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html - if [[ $SRS_DETECT_SENDMMSG == YES ]]; then - mkdir -p ${SRS_OBJS} && - echo " #include " > ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " int main(int argc, char** argv) { " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " struct mmsghdr hdr; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " hdr.msg_len = 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " return 0; " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - echo " } " >> ${SRS_OBJS}/_tmp_sendmmsg_detect.c - ${SRS_TOOL_CC} -c ${SRS_OBJS}/_tmp_sendmmsg_detect.c -D_GNU_SOURCE -o /dev/null >/dev/null 2>&1 - ret=$?; rm -f ${SRS_OBJS}/_tmp_sendmmsg_detect.c; - if [[ $ret -ne 0 ]]; then - SRS_HAS_SENDMMSG=NO - fi - fi - - # If system has no sendmmsg, disable sendmmsg. - if [[ $SRS_HAS_SENDMMSG == NO ]]; then - if [[ $SRS_SENDMMSG == YES ]]; then - echo "Disable UDP sendmmsg automatically" - SRS_SENDMMSG=NO - fi - fi } apply_user_detail_options @@ -666,8 +637,6 @@ function regenerate_options() { if [ $SRS_NASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --nasm=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --nasm=off"; fi if [ $SRS_SRTP_ASM = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srtp-nasm=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --srtp-nasm=off"; fi if [ $SRS_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sendmmsg=off"; fi - if [ $SRS_DETECT_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --detect-sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --detect-sendmmsg=off"; fi - if [ $SRS_HAS_SENDMMSG = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --has-sendmmsg=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --has-sendmmsg=off"; fi if [ $SRS_CLEAN = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --clean=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --clean=off"; fi if [ $SRS_GPERF = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gperf=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gperf=off"; fi if [ $SRS_GPERF_MC = YES ]; then SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmc=on"; else SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --gmc=off"; fi diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 12c990cf4..b234d3f38 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -4781,7 +4781,7 @@ bool SrsConfig::get_rtc_server_encrypt() int SrsConfig::get_rtc_server_sendmmsg() { -#if !defined(SRS_HAS_SENDMMSG) || !defined(SRS_SENDMMSG) +#if !defined(SRS_SENDMMSG) return 1; #else static int DEFAULT = 256; diff --git a/trunk/src/app/srs_app_listener.hpp b/trunk/src/app/srs_app_listener.hpp index 46fd11a7e..5fd32f07c 100644 --- a/trunk/src/app/srs_app_listener.hpp +++ b/trunk/src/app/srs_app_listener.hpp @@ -138,9 +138,9 @@ public: virtual ~ISrsUdpSender(); public: // Fetch a mmsghdr from sender's cache. - virtual srs_error_t fetch(mmsghdr** pphdr) = 0; + virtual srs_error_t fetch(srs_mmsghdr** pphdr) = 0; // Notify the sender to send out the msg. - virtual srs_error_t sendmmsg(mmsghdr* hdr) = 0; + virtual srs_error_t sendmmsg(srs_mmsghdr* hdr) = 0; // Whether sender exceed the max queue, that is, overflow. virtual bool overflow() = 0; // Set the queue extra ratio, for example, when mw_msgs > 0, we need larger queue. diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 34dad0f46..51c5f7ed4 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -965,7 +965,7 @@ srs_error_t SrsRtcSenderThread::send_packets(SrsRtcPackets& packets) // Fetch a cached message from queue. // TODO: FIXME: Maybe encrypt in async, so the state of mhdr maybe not ready. - mmsghdr* mhdr = NULL; + srs_mmsghdr* mhdr = NULL; if ((err = sender->fetch(&mhdr)) != srs_success) { return srs_error_wrap(err, "fetch msghdr"); } @@ -1028,7 +1028,7 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); // Previous handler, if has the same size, we can use GSO. - mmsghdr* gso_mhdr = NULL; int gso_size = 0; int gso_encrypt = 0; int gso_cursor = 0; + srs_mmsghdr* gso_mhdr = NULL; int gso_size = 0; int gso_encrypt = 0; int gso_cursor = 0; // GSO, N packets has same length, the final one may not. bool using_gso = false; bool gso_final = false; // The message will marshal in iovec. @@ -1099,7 +1099,7 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) } // For GSO, reuse mhdr if possible. - mmsghdr* mhdr = gso_mhdr; + srs_mmsghdr* mhdr = gso_mhdr; if (!mhdr) { // Fetch a cached message from queue. // TODO: FIXME: Maybe encrypt in async, so the state of mhdr maybe not ready. @@ -2970,13 +2970,13 @@ srs_error_t SrsUdpMuxSender::initialize(srs_netfd_t fd, int senders) return err; } -void SrsUdpMuxSender::free_mhdrs(std::vector& mhdrs) +void SrsUdpMuxSender::free_mhdrs(std::vector& mhdrs) { int nn_mhdrs = (int)mhdrs.size(); for (int i = 0; i < nn_mhdrs; i++) { // @see https://linux.die.net/man/2/sendmmsg // @see https://linux.die.net/man/2/sendmsg - mmsghdr* hdr = &mhdrs[i]; + srs_mmsghdr* hdr = &mhdrs[i]; // Free control for GSO. char* msg_control = (char*)hdr->msg_hdr.msg_control; @@ -2993,13 +2993,13 @@ void SrsUdpMuxSender::free_mhdrs(std::vector& mhdrs) mhdrs.clear(); } -srs_error_t SrsUdpMuxSender::fetch(mmsghdr** pphdr) +srs_error_t SrsUdpMuxSender::fetch(srs_mmsghdr** pphdr) { // TODO: FIXME: Maybe need to shrink? if (cache_pos >= (int)cache.size()) { // @see https://linux.die.net/man/2/sendmmsg // @see https://linux.die.net/man/2/sendmsg - mmsghdr mhdr; + srs_mmsghdr mhdr; mhdr.msg_len = 0; mhdr.msg_hdr.msg_flags = 0; @@ -3040,7 +3040,7 @@ void SrsUdpMuxSender::set_extra_ratio(int r) max_sendmmsg, gso, queue_length, nn_senders, extra_ratio, extra_queue, cache_pos, (int)cache.size(), (int)hotspot.size()); } -srs_error_t SrsUdpMuxSender::sendmmsg(mmsghdr* hdr) +srs_error_t SrsUdpMuxSender::sendmmsg(srs_mmsghdr* hdr) { if (waiting_msgs) { waiting_msgs = false; @@ -3092,7 +3092,7 @@ srs_error_t SrsUdpMuxSender::cycle() // Send out all messages. // @see https://linux.die.net/man/2/sendmmsg // @see https://linux.die.net/man/2/sendmsg - mmsghdr* p = &hotspot[0]; mmsghdr* end = p + pos; + srs_mmsghdr* p = &hotspot[0]; srs_mmsghdr* end = p + pos; for (p = &hotspot[0]; p < end; p += max_sendmmsg) { int vlen = (int)(end - p); vlen = srs_min(max_sendmmsg, vlen); @@ -3113,7 +3113,7 @@ srs_error_t SrsUdpMuxSender::cycle() // @see https://linux.die.net/man/2/sendmmsg // @see https://linux.die.net/man/2/sendmsg for (int i = 0; i < pos; i++) { - mmsghdr* mhdr = &hotspot[i]; + srs_mmsghdr* mhdr = &hotspot[i]; nn_writen += (int)mhdr->msg_len; @@ -3159,7 +3159,7 @@ srs_error_t SrsUdpMuxSender::cycle() int nn_cache = 0; int nn_hotspot_size = (int)hotspot.size(); for (int i = 0; i < nn_hotspot_size; i++) { - mmsghdr* hdr = &hotspot[i]; + srs_mmsghdr* hdr = &hotspot[i]; nn_cache += hdr->msg_hdr.msg_iovlen; } diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 3f4018644..35c01b3a6 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -388,9 +388,9 @@ private: private: // Hotspot msgs, we are working on it. // @remark We will wait util all messages are ready. - std::vector hotspot; + std::vector hotspot; // Cache msgs, for other coroutines to fill it. - std::vector cache; + std::vector cache; int cache_pos; // The max number of messages for sendmmsg. If 1, we use sendmsg to send. int max_sendmmsg; @@ -405,10 +405,10 @@ public: public: virtual srs_error_t initialize(srs_netfd_t fd, int senders); private: - void free_mhdrs(std::vector& mhdrs); + void free_mhdrs(std::vector& mhdrs); public: - virtual srs_error_t fetch(mmsghdr** pphdr); - virtual srs_error_t sendmmsg(mmsghdr* hdr); + virtual srs_error_t fetch(srs_mmsghdr** pphdr); + virtual srs_error_t sendmmsg(srs_mmsghdr* hdr); virtual bool overflow(); virtual void set_extra_ratio(int r); public: diff --git a/trunk/src/protocol/srs_sip_stack.cpp b/trunk/src/protocol/srs_sip_stack.cpp index 19d959723..65a383dfd 100644 --- a/trunk/src/protocol/srs_sip_stack.cpp +++ b/trunk/src/protocol/srs_sip_stack.cpp @@ -635,9 +635,9 @@ srs_error_t SrsSipStack::do_parse_request(SrsSipRequest* req, const char* recv_m std::vector vec_device_status = srs_string_split(body_map["Response@DeviceList@Item@Status"], ","); //map key:devicd_id value:status - for(int i=0 ; i i) { + if ((int)vec_device_id.size() > i) { status = vec_device_status.at(i); } @@ -653,7 +653,7 @@ srs_error_t SrsSipStack::do_parse_request(SrsSipRequest* req, const char* recv_m if (cmdtype == "Keepalive"){ //TODO: ???? std::vector vec_device_id = srs_string_split(body_map["Notify@Info@DeviceID"], ","); - for(int i=0; idevice_list_map[vec_device_id.at(i)] = "OFF"; } }else{ diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index 73e2252ac..78e3705d8 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -412,12 +412,12 @@ int srs_sendmsg(srs_netfd_t stfd, const struct msghdr *msg, int flags, srs_utime return st_sendmsg((st_netfd_t)stfd, msg, flags, (st_utime_t)timeout); } -int srs_sendmmsg(srs_netfd_t stfd, struct mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout) +int srs_sendmmsg(srs_netfd_t stfd, struct srs_mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout) { -#if !defined(SRS_HAS_SENDMMSG) || !defined(SRS_SENDMMSG) +#if !defined(SRS_SENDMMSG) // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html for (int i = 0; i < (int)vlen; ++i) { - struct mmsghdr* p = msgvec + i; + struct srs_mmsghdr* p = msgvec + i; int n = srs_sendmsg(stfd, &p->msg_hdr, flags, timeout); if (n < 0) { // An error is returned only if no datagrams could be sent. @@ -457,7 +457,7 @@ int srs_sendmmsg(srs_netfd_t stfd, struct mmsghdr *msgvec, unsigned int vlen, in return 1; } - return st_sendmmsg((st_netfd_t)stfd, msgvec, vlen, flags, (st_utime_t)timeout); + return st_sendmmsg((st_netfd_t)stfd, (void*)msgvec, vlen, flags, (st_utime_t)timeout); #endif } diff --git a/trunk/src/service/srs_service_st.hpp b/trunk/src/service/srs_service_st.hpp index 7d789b2cc..f3f0a8e80 100644 --- a/trunk/src/service/srs_service_st.hpp +++ b/trunk/src/service/srs_service_st.hpp @@ -92,15 +92,13 @@ extern int srs_sendto(srs_netfd_t stfd, void *buf, int len, const struct sockadd extern int srs_recvmsg(srs_netfd_t stfd, struct msghdr *msg, int flags, srs_utime_t timeout); extern int srs_sendmsg(srs_netfd_t stfd, const struct msghdr *msg, int flags, srs_utime_t timeout); -#if !defined(SRS_HAS_SENDMMSG) - // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html - #include - struct mmsghdr { - struct msghdr msg_hdr; /* Message header */ - unsigned int msg_len; /* Number of bytes transmitted */ - }; -#endif -extern int srs_sendmmsg(srs_netfd_t stfd, struct mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout); +// @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html +#include +struct srs_mmsghdr { + struct msghdr msg_hdr; /* Message header */ + unsigned int msg_len; /* Number of bytes transmitted */ +}; +extern int srs_sendmmsg(srs_netfd_t stfd, struct srs_mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout); extern srs_netfd_t srs_accept(srs_netfd_t stfd, struct sockaddr *addr, int *addrlen, srs_utime_t timeout); From f71b8335200a249114287766cf09a9d3bd38cc02 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 11:32:54 +0800 Subject: [PATCH 46/79] Refine sendmmsg, move to ST --- trunk/3rdparty/st-srs/io.c | 29 +++++++++++++++--- trunk/3rdparty/st-srs/public.h | 10 +++++- trunk/auto/options.sh | 5 +++ trunk/configure | 2 +- trunk/src/service/srs_service_st.cpp | 46 +--------------------------- 5 files changed, 40 insertions(+), 52 deletions(-) diff --git a/trunk/3rdparty/st-srs/io.c b/trunk/3rdparty/st-srs/io.c index 35a3110c6..7e05f99ae 100644 --- a/trunk/3rdparty/st-srs/io.c +++ b/trunk/3rdparty/st-srs/io.c @@ -742,12 +742,9 @@ int st_sendmsg(_st_netfd_t *fd, const struct msghdr *msg, int flags, st_utime_t return n; } - -int st_sendmmsg(st_netfd_t fd, void *msgvec, unsigned int vlen, int flags, st_utime_t timeout) +int st_sendmmsg(st_netfd_t fd, struct st_mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout) { -#if !defined(MD_HAVE_SENDMMSG) || !defined(_GNU_SOURCE) - return -1; -#else +#if defined(MD_HAVE_SENDMMSG) && defined(_GNU_SOURCE) int n; int left; struct mmsghdr *p; @@ -774,6 +771,28 @@ int st_sendmmsg(st_netfd_t fd, void *msgvec, unsigned int vlen, int flags, st_ut return n; } return (int)vlen - left; +#else + struct st_mmsghdr *p; + int i, n; + + // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html + for (i = 0; i < (int)vlen; ++i) { + p = msgvec + i; + n = st_sendmsg(fd, &p->msg_hdr, flags, timeout); + if (n < 0) { + // An error is returned only if no datagrams could be sent. + if (i == 0) { + return n; + } + return i + 1; + } + + p->msg_len = n; + } + + // Returns the number of messages sent from msgvec; if this is less than vlen, the caller can retry with a + // further sendmmsg() call to send the remaining messages. + return vlen; #endif } diff --git a/trunk/3rdparty/st-srs/public.h b/trunk/3rdparty/st-srs/public.h index a581adc08..80fd93346 100644 --- a/trunk/3rdparty/st-srs/public.h +++ b/trunk/3rdparty/st-srs/public.h @@ -151,7 +151,15 @@ extern int st_recvfrom(st_netfd_t fd, void *buf, int len, struct sockaddr *from, extern int st_sendto(st_netfd_t fd, const void *msg, int len, const struct sockaddr *to, int tolen, st_utime_t timeout); extern int st_recvmsg(st_netfd_t fd, struct msghdr *msg, int flags, st_utime_t timeout); extern int st_sendmsg(st_netfd_t fd, const struct msghdr *msg, int flags, st_utime_t timeout); -extern int st_sendmmsg(st_netfd_t fd, void *msgvec, unsigned int vlen, int flags, st_utime_t timeout); + +// @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html +#include +struct st_mmsghdr { + struct msghdr msg_hdr; /* Message header */ + unsigned int msg_len; /* Number of bytes transmitted */ +}; +extern int st_sendmmsg(st_netfd_t fd, struct st_mmsghdr *msgvec, unsigned int vlen, int flags, st_utime_t timeout); + extern st_netfd_t st_open(const char *path, int oflags, mode_t mode); #ifdef DEBUG diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index a5848485b..97f6dcf92 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -608,6 +608,11 @@ function apply_user_detail_options() { echo "Disable SRTP ASM, because NASM is disabled." SRS_SRTP_ASM=NO fi + + if [[ $SRS_OSX == YES && $SRS_SENDMMSG == YES ]]; then + echo "Disable sendmmsg for OSX" + SRS_SENDMMSG=NO + fi } apply_user_detail_options diff --git a/trunk/configure b/trunk/configure index 974a9163b..115e5f8d5 100755 --- a/trunk/configure +++ b/trunk/configure @@ -188,7 +188,7 @@ if [[ $SRS_GCOV == YES ]]; then SrsLinkOptions="${SrsLinkOptions} ${SrsGcov}"; fi # For FFMPEG/RTC. -if [[ $SRS_RTC == YES && $SRS_NASM == NO ]]; then +if [[ $SRS_RTC == YES && $SRS_NASM == NO && $SRS_OSX == NO ]]; then SrsLinkOptions="${SrsLinkOptions} -lrt"; fi diff --git a/trunk/src/service/srs_service_st.cpp b/trunk/src/service/srs_service_st.cpp index 78e3705d8..e7181cae4 100644 --- a/trunk/src/service/srs_service_st.cpp +++ b/trunk/src/service/srs_service_st.cpp @@ -414,51 +414,7 @@ int srs_sendmsg(srs_netfd_t stfd, const struct msghdr *msg, int flags, srs_utime int srs_sendmmsg(srs_netfd_t stfd, struct srs_mmsghdr *msgvec, unsigned int vlen, int flags, srs_utime_t timeout) { -#if !defined(SRS_SENDMMSG) - // @see http://man7.org/linux/man-pages/man2/sendmmsg.2.html - for (int i = 0; i < (int)vlen; ++i) { - struct srs_mmsghdr* p = msgvec + i; - int n = srs_sendmsg(stfd, &p->msg_hdr, flags, timeout); - if (n < 0) { - // An error is returned only if no datagrams could be sent. - if (i == 0) { - return n; - } - return i + 1; - } - - p->msg_len = n; - } - // Returns the number of messages sent from msgvec; if this is less than vlen, the caller can retry with a - // further sendmmsg() call to send the remaining messages. - return vlen; -#else - if (vlen == 1) { - #if 1 - int r0 = srs_sendmsg(stfd, &msgvec->msg_hdr, flags, timeout); - if (r0 < 0) { - return r0; - } - msgvec->msg_len = r0; - #else - msgvec->msg_len = 0; - - int tolen = (int)msgvec->msg_hdr.msg_namelen; - const struct sockaddr* to = (const struct sockaddr*)msgvec->msg_hdr.msg_name; - for (int i = 0; i < (int)msgvec->msg_hdr.msg_iovlen; i++) { - iovec* iov = msgvec->msg_hdr.msg_iov + i; - int r0 = srs_sendto(stfd, (void*)iov->iov_base, (int)iov->iov_len, to, tolen, timeout); - if (r0 < 0) { - return r0; - } - msgvec->msg_len += r0; - } - #endif - - return 1; - } - return st_sendmmsg((st_netfd_t)stfd, (void*)msgvec, vlen, flags, (st_utime_t)timeout); -#endif + return st_sendmmsg((st_netfd_t)stfd, (struct st_mmsghdr*)msgvec, vlen, flags, (st_utime_t)timeout); } srs_netfd_t srs_accept(srs_netfd_t stfd, struct sockaddr *addr, int *addrlen, srs_utime_t timeout) From ef64c5e2bda8d40f891759a5c6a8e86f5095c33c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 13:11:38 +0800 Subject: [PATCH 47/79] Refine RTC, reject when config disabled. --- trunk/research/players/rtc_player.html | 4 ++++ trunk/research/players/rtc_publisher.html | 9 +++++++++ trunk/src/app/srs_app_config.cpp | 2 +- trunk/src/app/srs_app_config.hpp | 2 +- trunk/src/app/srs_app_http_api.cpp | 22 ++++++++++++++++++++++ trunk/src/app/srs_app_sdp.cpp | 2 +- trunk/src/kernel/srs_kernel_error.hpp | 1 + 7 files changed, 39 insertions(+), 3 deletions(-) diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index c78fcdb5b..03d23bd13 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -112,6 +112,9 @@ contentType:'application/json', dataType: 'json' }).done(function(data) { console.log("Got answer: ", data); + if (data.code) { + reject(data); return; + } resolve(data.sdp); }).fail(function(reason){ reject(reason); @@ -120,6 +123,7 @@ }).then(function(answer) { return pc.setRemoteDescription(new RTCSessionDescription({type: 'answer', sdp: answer})); }).catch(function(reason) { + pc.close(); $('#rtc_media_player').hide(); throw reason; }); }; diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index ce183782d..0035a20aa 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -124,6 +124,9 @@ contentType:'application/json', dataType: 'json' }).done(function(data) { console.log("Got answer: ", data); + if (data.code) { + reject(data); return; + } resolve(data.sdp); }).fail(function(reason){ reject(reason); @@ -132,6 +135,12 @@ }).then(function(answer) { return pc.setRemoteDescription(new RTCSessionDescription({type: 'answer', sdp: answer})); }).catch(function(reason) { + pc.getLocalStreams().forEach(function(stream){ + stream.getTracks().forEach(function(track) { + track.stop(); + }); + }); + pc.close(); $('#rtc_media_player').hide(); throw reason; }); }; diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index b234d3f38..3f740346a 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -4679,7 +4679,7 @@ srs_utime_t SrsConfig::get_stream_caster_gb28181_sip_query_catalog_interval(SrsC return (srs_utime_t)(::atoi(conf->arg0().c_str()) * SRS_UTIME_SECONDS); } -int SrsConfig::get_rtc_server_enabled() +bool SrsConfig::get_rtc_server_enabled() { SrsConfDirective* conf = root->get("rtc_server"); return get_rtc_server_enabled(conf); diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index ab9ac5ac2..44d4ccb00 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -521,7 +521,7 @@ public: // rtc section public: - virtual int get_rtc_server_enabled(); + virtual bool get_rtc_server_enabled(); virtual bool get_rtc_server_enabled(SrsConfDirective* conf); virtual int get_rtc_server_listen(); virtual std::string get_rtc_server_candidates(); diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 50ca4a328..57b67453e 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -918,6 +918,17 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe request.vhost = parsed_vhost->arg0(); } + // Whether enabled. + bool server_enabled = _srs_config->get_rtc_server_enabled(); + bool rtc_enabled = _srs_config->get_rtc_enabled(request.vhost); + if (server_enabled && !rtc_enabled) { + srs_warn("RTC disabled in vhost %s", request.vhost.c_str()); + } + if (!server_enabled || !rtc_enabled) { + return srs_error_new(ERROR_RTC_DISABLED, "Disabled server=%d, rtc=%d, vhost=%s", + server_enabled, rtc_enabled, request.vhost.c_str()); + } + // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. SrsRtcSession* rtc_session = NULL; @@ -1232,6 +1243,17 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt request.vhost = parsed_vhost->arg0(); } + // Whether enabled. + bool server_enabled = _srs_config->get_rtc_server_enabled(); + bool rtc_enabled = _srs_config->get_rtc_enabled(request.vhost); + if (server_enabled && !rtc_enabled) { + srs_warn("RTC disabled in vhost %s", request.vhost.c_str()); + } + if (!server_enabled || !rtc_enabled) { + return srs_error_new(ERROR_RTC_DISABLED, "Disabled server=%d, rtc=%d, vhost=%s", + server_enabled, rtc_enabled, request.vhost.c_str()); + } + // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. SrsRtcSession* rtc_session = NULL; diff --git a/trunk/src/app/srs_app_sdp.cpp b/trunk/src/app/srs_app_sdp.cpp index 9fc227be6..0dc001f60 100644 --- a/trunk/src/app/srs_app_sdp.cpp +++ b/trunk/src/app/srs_app_sdp.cpp @@ -528,7 +528,7 @@ srs_error_t SrsMediaDesc::parse_attr_mid(const std::string& value) std::istringstream is(value); // mid_ means m-line id FETCH(is, mid_); - srs_trace("mid=%s", mid_.c_str()); + srs_verbose("mid=%s", mid_.c_str()); return err; } diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp index 9f88c1dda..597d0bb32 100644 --- a/trunk/src/kernel/srs_kernel_error.hpp +++ b/trunk/src/kernel/srs_kernel_error.hpp @@ -349,6 +349,7 @@ #define ERROR_RTC_SDP_EXCHANGE 5018 #define ERROR_RTC_API_BODY 5019 #define ERROR_RTC_SOURCE_BUSY 5020 +#define ERROR_RTC_DISABLED 5021 /////////////////////////////////////////////////////// // GB28181 API error. From 9c8b7279f05b10aaa227a85e3adc175ad0290cf7 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 13:37:04 +0800 Subject: [PATCH 48/79] Refactor RTC publisher queue, rename sender to player --- trunk/src/app/srs_app_rtc_conn.cpp | 60 ++++++++++----------- trunk/src/app/srs_app_rtc_conn.hpp | 11 ++-- trunk/src/app/srs_app_rtp_queue.cpp | 83 +++++++++-------------------- trunk/src/app/srs_app_rtp_queue.hpp | 21 +++----- 4 files changed, 65 insertions(+), 110 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 51c5f7ed4..e41c4b572 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -595,7 +595,7 @@ SrsRtpPacket2* SrsRtcPackets::at(int index) return cache + index; } -SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, int parent_cid) +SrsRtcPlayer::SrsRtcPlayer(SrsRtcSession* s, int parent_cid) { _parent_cid = parent_cid; trd = new SrsDummyCoroutine(); @@ -618,14 +618,14 @@ SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, int parent_cid) _srs_config->subscribe(this); } -SrsRtcSenderThread::~SrsRtcSenderThread() +SrsRtcPlayer::~SrsRtcPlayer() { _srs_config->unsubscribe(this); srs_freep(trd); } -srs_error_t SrsRtcSenderThread::initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt) +srs_error_t SrsRtcPlayer::initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt) { srs_error_t err = srs_success; @@ -644,7 +644,7 @@ srs_error_t SrsRtcSenderThread::initialize(const uint32_t& vssrc, const uint32_t return err; } -srs_error_t SrsRtcSenderThread::on_reload_rtc_server() +srs_error_t SrsRtcPlayer::on_reload_rtc_server() { gso = _srs_config->get_rtc_server_gso(); merge_nalus = _srs_config->get_rtc_server_merge_nalus(); @@ -655,7 +655,7 @@ srs_error_t SrsRtcSenderThread::on_reload_rtc_server() return srs_success; } -srs_error_t SrsRtcSenderThread::on_reload_vhost_play(string vhost) +srs_error_t SrsRtcPlayer::on_reload_vhost_play(string vhost) { SrsRequest* req = rtc_session->req; @@ -672,17 +672,17 @@ srs_error_t SrsRtcSenderThread::on_reload_vhost_play(string vhost) return srs_success; } -srs_error_t SrsRtcSenderThread::on_reload_vhost_realtime(string vhost) +srs_error_t SrsRtcPlayer::on_reload_vhost_realtime(string vhost) { return on_reload_vhost_play(vhost); } -int SrsRtcSenderThread::cid() +int SrsRtcPlayer::cid() { return trd->cid(); } -srs_error_t SrsRtcSenderThread::start() +srs_error_t SrsRtcPlayer::start() { srs_error_t err = srs_success; @@ -696,17 +696,17 @@ srs_error_t SrsRtcSenderThread::start() return err; } -void SrsRtcSenderThread::stop() +void SrsRtcPlayer::stop() { trd->stop(); } -void SrsRtcSenderThread::stop_loop() +void SrsRtcPlayer::stop_loop() { trd->interrupt(); } -srs_error_t SrsRtcSenderThread::cycle() +srs_error_t SrsRtcPlayer::cycle() { srs_error_t err = srs_success; @@ -833,7 +833,7 @@ srs_error_t SrsRtcSenderThread::cycle() } } -srs_error_t SrsRtcSenderThread::send_messages( +srs_error_t SrsRtcPlayer::send_messages( SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets ) { srs_error_t err = srs_success; @@ -866,7 +866,7 @@ srs_error_t SrsRtcSenderThread::send_messages( return err; } -srs_error_t SrsRtcSenderThread::messages_to_packets( +srs_error_t SrsRtcPlayer::messages_to_packets( SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets ) { srs_error_t err = srs_success; @@ -951,7 +951,7 @@ srs_error_t SrsRtcSenderThread::messages_to_packets( return err; } -srs_error_t SrsRtcSenderThread::send_packets(SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::send_packets(SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1019,7 +1019,7 @@ srs_error_t SrsRtcSenderThread::send_packets(SrsRtcPackets& packets) } // TODO: FIXME: We can gather and pad audios, because they have similar size. -srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1222,7 +1222,7 @@ srs_error_t SrsRtcSenderThread::send_packets_gso(SrsRtcPackets& packets) return err; } -srs_error_t SrsRtcSenderThread::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1312,7 +1312,7 @@ srs_error_t SrsRtcSenderThread::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPa return err; } -srs_error_t SrsRtcSenderThread::package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload) +srs_error_t SrsRtcPlayer::package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload) { srs_error_t err = srs_success; @@ -1348,7 +1348,7 @@ srs_error_t SrsRtcSenderThread::package_opus(SrsSample* sample, SrsRtcPackets& p return err; } -srs_error_t SrsRtcSenderThread::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1389,7 +1389,7 @@ srs_error_t SrsRtcSenderThread::package_fu_a(SrsSharedPtrMessage* msg, SrsSample } // Single NAL Unit Packet @see https://tools.ietf.org/html/rfc6184#section-5.6 -srs_error_t SrsRtcSenderThread::package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1409,7 +1409,7 @@ srs_error_t SrsRtcSenderThread::package_single_nalu(SrsSharedPtrMessage* msg, Sr return err; } -srs_error_t SrsRtcSenderThread::package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets) { srs_error_t err = srs_success; @@ -1937,7 +1937,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frames() srs_error_t err = srs_success; std::vector > frames; - audio_queue_->collect_frames(frames); + audio_queue_->collect_frames(audio_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { vector& packets = frames[i]; @@ -2031,7 +2031,7 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) srs_error_t SrsRtcPublisher::collect_video_frames() { std::vector > frames; - video_queue_->collect_frames(frames); + video_queue_->collect_frames(video_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { vector& packets = frames[i]; @@ -2252,7 +2252,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s) source_ = NULL; publisher = NULL; - sender = NULL; + player = NULL; sendonly_skt = NULL; rtc_server = s; dtls_session = new SrsDtlsSession(this); @@ -2268,7 +2268,7 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s) SrsRtcSession::~SrsRtcSession() { - srs_freep(sender); + srs_freep(player); srs_freep(publisher); srs_freep(dtls_session); srs_freep(req); @@ -2551,8 +2551,8 @@ srs_error_t SrsRtcSession::start_play() { srs_error_t err = srs_success; - srs_freep(sender); - sender = new SrsRtcSenderThread(this, _srs_context->get_id()); + srs_freep(player); + player = new SrsRtcPlayer(this, _srs_context->get_id()); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2569,12 +2569,12 @@ srs_error_t SrsRtcSession::start_play() } } - if ((err = sender->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { - return srs_error_wrap(err, "SrsRtcSenderThread init"); + if ((err = player->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { + return srs_error_wrap(err, "SrsRtcPlayer init"); } - if ((err = sender->start()) != srs_success) { - return srs_error_wrap(err, "start SrsRtcSenderThread"); + if ((err = player->start()) != srs_success) { + return srs_error_wrap(err, "start SrsRtcPlayer"); } return err; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 35c01b3a6..5522c986f 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -194,8 +194,7 @@ public: SrsRtpPacket2* at(int index); }; -// TODO: FIXME: Rename to RTC player or subscriber. -class SrsRtcSenderThread : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler +class SrsRtcPlayer : virtual public ISrsCoroutineHandler, virtual public ISrsReloadHandler { protected: SrsCoroutine* trd; @@ -221,8 +220,8 @@ private: int mw_msgs; bool realtime; public: - SrsRtcSenderThread(SrsRtcSession* s, int parent_cid); - virtual ~SrsRtcSenderThread(); + SrsRtcPlayer(SrsRtcSession* s, int parent_cid); + virtual ~SrsRtcPlayer(); public: srs_error_t initialize(const uint32_t& vssrc, const uint32_t& assrc, const uint16_t& v_pt, const uint16_t& a_pt); // interface ISrsReloadHandler @@ -303,13 +302,13 @@ public: class SrsRtcSession { friend class SrsDtlsSession; - friend class SrsRtcSenderThread; + friend class SrsRtcPlayer; friend class SrsRtcPublisher; private: SrsRtcServer* rtc_server; SrsRtcSessionStateType session_state; SrsDtlsSession* dtls_session; - SrsRtcSenderThread* sender; + SrsRtcPlayer* player; SrsRtcPublisher* publisher; bool is_publisher_; private: diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index b685cebce..a3831949f 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -187,11 +187,6 @@ bool SrsRtpRingBuffer::overflow() return high_ - low_ >= capacity_; } -bool SrsRtpRingBuffer::is_heavy() -{ - return high_ - low_ >= capacity_ / 2; -} - uint16_t SrsRtpRingBuffer::next_start_of_frame() { if (low_ == high_) { @@ -269,7 +264,7 @@ SrsRtpPacket2* SrsRtpRingBuffer::at(uint16_t seq) return queue_[seq % capacity_]; } -SrsRtpQueue::SrsRtpQueue(const char* tag, int capacity) +SrsRtpQueue::SrsRtpQueue(int capacity) { nn_collected_frames = 0; queue_ = new SrsRtpRingBuffer(capacity); @@ -282,8 +277,6 @@ SrsRtpQueue::SrsRtpQueue(const char* tag, int capacity) num_of_packet_received_ = 0; number_of_packet_lossed_ = 0; - - tag_ = tag; } SrsRtpQueue::~SrsRtpQueue() @@ -329,27 +322,17 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt uint16_t nack_low = 0, nack_high = 0; queue_->update(seq, !nn_collected_frames, nack_low, nack_high); if (srs_rtp_seq_distance(nack_low, nack_high)) { - srs_trace("%s update nack seq=%u, startup=%d, range [%u, %u]", tag_, seq, !nn_collected_frames, nack_low, nack_high); + srs_trace("update nack seq=%u, startup=%d, range [%u, %u]", seq, !nn_collected_frames, nack_low, nack_high); insert_into_nack_list(nack, nack_low, nack_high); } } - // When packets overflow, collect frame and move head to next frame start. - if (queue_->overflow()) { - on_overflow(nack); - } - // Save packet at the position seq. queue_->set(seq, pkt); return err; } -void SrsRtpQueue::collect_frames(std::vector >& frames) -{ - frames.swap(frames_); -} - void SrsRtpQueue::notify_drop_seq(uint16_t seq) { uint16_t next = queue_->next_start_of_frame(); @@ -360,7 +343,7 @@ void SrsRtpQueue::notify_drop_seq(uint16_t seq) } // When NACK is timeout, move to the next start of frame. - srs_trace("%s nack drop seq=%u, drop range [%u, %u]", tag_, seq, queue_->low(), next + 1); + srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); queue_->advance_to(next + 1); } @@ -374,7 +357,7 @@ void SrsRtpQueue::notify_nack_list_full() } // When NACK is overflow, move to the next keyframe. - srs_trace("%s nack overflow drop range [%u, %u]", tag_, queue_->low(), next + 1); + srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); queue_->advance_to(next + 1); } @@ -417,7 +400,7 @@ void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t se nack->check_queue_size(); } -SrsRtpAudioQueue::SrsRtpAudioQueue(int capacity) : SrsRtpQueue("audio", capacity) +SrsRtpAudioQueue::SrsRtpAudioQueue(int capacity) : SrsRtpQueue(capacity) { } @@ -425,27 +408,21 @@ SrsRtpAudioQueue::~SrsRtpAudioQueue() { } -srs_error_t SrsRtpAudioQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) +void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames) { - srs_error_t err = srs_success; + collect_packet(frames, nack); - if ((err = SrsRtpQueue::consume(nack, pkt)) != srs_success) { - return srs_error_wrap(err, "audio queue"); + if (queue_->overflow()) { + on_overflow(nack); } - - // For audio, always try to collect frame, because each packet is a frame. - collect_packet(nack); - - return err; } void SrsRtpAudioQueue::on_overflow(SrsRtpNackForReceiver* nack) { - collect_packet(nack); queue_->advance_to(queue_->high()); } -void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) +void SrsRtpAudioQueue::collect_packet(vector >& frames, SrsRtpNackForReceiver* nack) { // When done, s point to the next available packet. uint16_t next = queue_->low(); @@ -455,7 +432,7 @@ void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) // Not found or in NACK, stop collecting frame. if (!pkt || nack->find(next) != NULL) { - srs_trace("%s wait for nack seq=%u", tag_, next); + srs_trace("wait for nack seq=%u", next); break; } @@ -465,19 +442,19 @@ void SrsRtpAudioQueue::collect_packet(SrsRtpNackForReceiver* nack) // Done, we got the last packet of frame. nn_collected_frames++; - frames_.push_back(frame); + frames.push_back(frame); } if (queue_->low() != next) { // Reset the range of packets to NULL in buffer. queue_->reset(queue_->low(), next); - srs_verbose("%s collect on frame, update head seq=%u t %u", tag_, queue_->low(), next); + srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); queue_->advance_to(next); } } -SrsRtpVideoQueue::SrsRtpVideoQueue(int capacity) : SrsRtpQueue("video", capacity) +SrsRtpVideoQueue::SrsRtpVideoQueue(int capacity) : SrsRtpQueue(capacity) { request_key_frame_ = false; } @@ -486,23 +463,13 @@ SrsRtpVideoQueue::~SrsRtpVideoQueue() { } -srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) +void SrsRtpVideoQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames) { - srs_error_t err = srs_success; + collect_packet(frames, nack); - if ((err = SrsRtpQueue::consume(nack, pkt)) != srs_success) { - return srs_error_wrap(err, "video queue"); + if (queue_->overflow()) { + on_overflow(nack); } - - // Collect packets to frame when: - // 1. Marker bit means the last packet of frame received. - // 2. Queue has lots of packets, the load is heavy. - // TODO: FIMXE: For real-time, we should collect each frame ASAP. - if (pkt->rtp_header.get_marker() || queue_->is_heavy()) { - collect_packet(nack); - } - - return err; } bool SrsRtpVideoQueue::should_request_key_frame() @@ -522,26 +489,24 @@ void SrsRtpVideoQueue::request_keyframe() void SrsRtpVideoQueue::on_overflow(SrsRtpNackForReceiver* nack) { - collect_packet(nack); - uint16_t next = queue_->next_start_of_frame(); // Note that low_ mean not found, clear queue util one packet. if (next == queue_->low()) { next = queue_->high() - 1; } - srs_trace("%s seq out of range [%u, %u]", tag_, queue_->low(), next); + srs_trace("seq out of range [%u, %u]", queue_->low(), next); for (uint16_t s = queue_->low(); s != next; ++s) { nack->remove(s); queue_->remove(s); } - srs_trace("%s force update seq %u to %u", tag_, queue_->low(), next + 1); + srs_trace("force update seq %u to %u", queue_->low(), next + 1); queue_->advance_to(next + 1); } -void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack) +void SrsRtpVideoQueue::collect_packet(vector >& frames, SrsRtpNackForReceiver* nack) { while (queue_->low() != queue_->high()) { vector frame; @@ -553,7 +518,7 @@ void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack) } nn_collected_frames++; - frames_.push_back(frame); + frames.push_back(frame); } } @@ -569,7 +534,7 @@ void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vectorfind(next) != NULL) { - srs_trace("%s wait for nack seq=%u", tag_, next); + srs_trace("wait for nack seq=%u", next); break; } @@ -599,7 +564,7 @@ void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vectorreset(queue_->low(), next); - srs_verbose("%s collect on frame, update head seq=%u t %u", tag_, queue_->low(), next); + srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); queue_->advance_to(next); } } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 07472d6de..a605df185 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -143,7 +143,6 @@ public: void reset(uint16_t low, uint16_t high); // Whether queue overflow or heavy(too many packets and need clear). bool overflow(); - bool is_heavy(); // For video, get the next start packet of frame. // @remark If not found, return the low_, which should never be the "next" one, // because it MAY or NOT current start packet of frame but never be the next. @@ -172,15 +171,11 @@ private: protected: SrsRtpRingBuffer* queue_; uint64_t nn_collected_frames; - std::vector > frames_; - const char* tag_; public: - SrsRtpQueue(const char* tag, int capacity); + SrsRtpQueue(int capacity); virtual ~SrsRtpQueue(); public: virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); - // TODO: FIXME: Should merge FU-A to RAW, then we can return RAW payloads. - void collect_frames(std::vector >& frames); void notify_drop_seq(uint16_t seq); void notify_nack_list_full(); public: @@ -190,8 +185,6 @@ public: uint32_t get_interarrival_jitter(); private: void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end); -protected: - virtual void on_overflow(SrsRtpNackForReceiver* nack) = 0; }; class SrsRtpAudioQueue : public SrsRtpQueue @@ -200,11 +193,10 @@ public: SrsRtpAudioQueue(int capacity); virtual ~SrsRtpAudioQueue(); public: - virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames); private: virtual void on_overflow(SrsRtpNackForReceiver* nack); -protected: - virtual void collect_packet(SrsRtpNackForReceiver* nack); + virtual void collect_packet(std::vector >& frames, SrsRtpNackForReceiver* nack); }; class SrsRtpVideoQueue : public SrsRtpQueue @@ -215,13 +207,12 @@ public: SrsRtpVideoQueue(int capacity); virtual ~SrsRtpVideoQueue(); public: - virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames); bool should_request_key_frame(); void request_keyframe(); -protected: - virtual void on_overflow(SrsRtpNackForReceiver* nack); private: - virtual void collect_packet(SrsRtpNackForReceiver* nack); + virtual void on_overflow(SrsRtpNackForReceiver* nack); + virtual void collect_packet(std::vector >& frames, SrsRtpNackForReceiver* nack); virtual void do_collect_packet(SrsRtpNackForReceiver* nack, std::vector& frame); }; From a23f1028748f963faaa8a64d2f77d5c4776d1f15 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 13:49:53 +0800 Subject: [PATCH 49/79] Refactor RTC, rename variables. --- trunk/src/app/srs_app_http_api.cpp | 30 ++-- trunk/src/app/srs_app_http_api.hpp | 8 +- trunk/src/app/srs_app_rtc_conn.cpp | 250 ++++++++++++++--------------- trunk/src/app/srs_app_rtc_conn.hpp | 56 +++---- 4 files changed, 171 insertions(+), 173 deletions(-) diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index 57b67453e..6041e3ced 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -789,9 +789,9 @@ srs_error_t SrsGoApiStreams::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa #ifdef SRS_RTC uint32_t SrsGoApiRtcPlay::ssrc_num = 0; -SrsGoApiRtcPlay::SrsGoApiRtcPlay(SrsRtcServer* rtc_svr) +SrsGoApiRtcPlay::SrsGoApiRtcPlay(SrsRtcServer* server) { - rtc_server = rtc_svr; + server_ = server; } SrsGoApiRtcPlay::~SrsGoApiRtcPlay() @@ -929,16 +929,15 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe server_enabled, rtc_enabled, request.vhost.c_str()); } - // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. - SrsRtcSession* rtc_session = NULL; - if ((err = rtc_server->create_rtc_session(&request, remote_sdp, local_sdp, eip, false, &rtc_session)) != srs_success) { + SrsRtcSession* session = NULL; + if ((err = server_->create_session(&request, remote_sdp, local_sdp, eip, false, &session)) != srs_success) { return srs_error_wrap(err, "create session"); } if (encrypt.empty()) { - rtc_session->set_encrypt(_srs_config->get_rtc_server_encrypt()); + session->set_encrypt(_srs_config->get_rtc_server_encrypt()); } else { - rtc_session->set_encrypt(encrypt != "false"); + session->set_encrypt(encrypt != "false"); } ostringstream os; @@ -956,9 +955,9 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe // TODO: add candidates in response json? res->set("sdp", SrsJsonAny::str(local_sdp_str.c_str())); - res->set("sessionid", SrsJsonAny::str(rtc_session->id().c_str())); + res->set("sessionid", SrsJsonAny::str(session->id().c_str())); - srs_trace("RTC sid=%s, offer=%dB, answer=%dB", rtc_session->id().c_str(), remote_sdp_str.length(), local_sdp_str.length()); + srs_trace("RTC sid=%s, offer=%dB, answer=%dB", session->id().c_str(), remote_sdp_str.length(), local_sdp_str.length()); return err; } @@ -1119,9 +1118,9 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(const std::string& app, const std::str uint32_t SrsGoApiRtcPublish::ssrc_num = 0; -SrsGoApiRtcPublish::SrsGoApiRtcPublish(SrsRtcServer* rtc_svr) +SrsGoApiRtcPublish::SrsGoApiRtcPublish(SrsRtcServer* server) { - rtc_server = rtc_svr; + server_ = server; } SrsGoApiRtcPublish::~SrsGoApiRtcPublish() @@ -1254,10 +1253,9 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt server_enabled, rtc_enabled, request.vhost.c_str()); } - // TODO: FIXME: Maybe need a better name? // TODO: FIXME: When server enabled, but vhost disabled, should report error. - SrsRtcSession* rtc_session = NULL; - if ((err = rtc_server->create_rtc_session(&request, remote_sdp, local_sdp, eip, true, &rtc_session)) != srs_success) { + SrsRtcSession* session = NULL; + if ((err = server_->create_session(&request, remote_sdp, local_sdp, eip, true, &session)) != srs_success) { return srs_error_wrap(err, "create session"); } @@ -1276,9 +1274,9 @@ srs_error_t SrsGoApiRtcPublish::do_serve_http(ISrsHttpResponseWriter* w, ISrsHtt // TODO: add candidates in response json? res->set("sdp", SrsJsonAny::str(local_sdp_str.c_str())); - res->set("sessionid", SrsJsonAny::str(rtc_session->id().c_str())); + res->set("sessionid", SrsJsonAny::str(session->id().c_str())); - srs_trace("RTC sid=%s, offer=%dB, answer=%dB", rtc_session->id().c_str(), remote_sdp_str.length(), local_sdp_str.length()); + srs_trace("RTC sid=%s, offer=%dB, answer=%dB", session->id().c_str(), remote_sdp_str.length(), local_sdp_str.length()); return err; } diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index ae1467fd1..638fbbb5d 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -173,9 +173,9 @@ class SrsGoApiRtcPlay : public ISrsHttpHandler public: static uint32_t ssrc_num; private: - SrsRtcServer* rtc_server; + SrsRtcServer* server_; public: - SrsGoApiRtcPlay(SrsRtcServer* rtc_svr); + SrsGoApiRtcPlay(SrsRtcServer* server); virtual ~SrsGoApiRtcPlay(); public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); @@ -190,9 +190,9 @@ class SrsGoApiRtcPublish : public ISrsHttpHandler public: static uint32_t ssrc_num; private: - SrsRtcServer* rtc_server; + SrsRtcServer* server_; public: - SrsGoApiRtcPublish(SrsRtcServer* rtc_svr); + SrsGoApiRtcPublish(SrsRtcServer* server); virtual ~SrsGoApiRtcPublish(); public: virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index e41c4b572..df078d71e 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -161,9 +161,9 @@ SrsNtp SrsNtp::to_time_ms(uint64_t ntp) } -SrsDtlsSession::SrsDtlsSession(SrsRtcSession* s) +SrsRtcDtls::SrsRtcDtls(SrsRtcSession* s) { - rtc_session = s; + session_ = s; dtls = NULL; bio_in = NULL; @@ -178,7 +178,7 @@ SrsDtlsSession::SrsDtlsSession(SrsRtcSession* s) handshake_done = false; } -SrsDtlsSession::~SrsDtlsSession() +SrsRtcDtls::~SrsRtcDtls() { if (dtls) { // this function will free bio_in and bio_out @@ -195,7 +195,7 @@ SrsDtlsSession::~SrsDtlsSession() } } -srs_error_t SrsDtlsSession::initialize(SrsRequest* r) +srs_error_t SrsRtcDtls::initialize(SrsRequest* r) { srs_error_t err = srs_success; @@ -225,7 +225,7 @@ srs_error_t SrsDtlsSession::initialize(SrsRequest* r) return err; } -srs_error_t SrsDtlsSession::handshake() +srs_error_t SrsRtcDtls::handshake() { srs_error_t err = srs_success; @@ -257,21 +257,21 @@ srs_error_t SrsDtlsSession::handshake() } if (out_bio_len) { - if ((err = rtc_session->sendonly_skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { + if ((err = session_->sendonly_skt->sendto(out_bio_data, out_bio_len, 0)) != srs_success) { return srs_error_wrap(err, "send dtls packet"); } } - if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + if (session_->blackhole && session_->blackhole_addr && session_->blackhole_stfd) { // Ignore any error for black-hole. - void* p = out_bio_data; int len = out_bio_len; SrsRtcSession* s = rtc_session; + void* p = out_bio_data; int len = out_bio_len; SrsRtcSession* s = session_; srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } return err; } -srs_error_t SrsDtlsSession::on_dtls(char* data, int nb_data) +srs_error_t SrsRtcDtls::on_dtls(char* data, int nb_data) { srs_error_t err = srs_success; if (BIO_reset(bio_in) != 1) { @@ -286,9 +286,9 @@ srs_error_t SrsDtlsSession::on_dtls(char* data, int nb_data) return srs_error_new(ERROR_OpenSslBIOWrite, "BIO_write"); } - if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + if (session_->blackhole && session_->blackhole_addr && session_->blackhole_stfd) { // Ignore any error for black-hole. - void* p = data; int len = nb_data; SrsRtcSession* s = rtc_session; + void* p = data; int len = nb_data; SrsRtcSession* s = session_; srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } @@ -310,20 +310,20 @@ srs_error_t SrsDtlsSession::on_dtls(char* data, int nb_data) return err; } -srs_error_t SrsDtlsSession::on_dtls_handshake_done() +srs_error_t SrsRtcDtls::on_dtls_handshake_done() { srs_error_t err = srs_success; - srs_trace("rtc session=%s, DTLS handshake done.", rtc_session->id().c_str()); + srs_trace("rtc session=%s, DTLS handshake done.", session_->id().c_str()); handshake_done = true; if ((err = srtp_initialize()) != srs_success) { return srs_error_wrap(err, "srtp init failed"); } - return rtc_session->on_connection_established(); + return session_->on_connection_established(); } -srs_error_t SrsDtlsSession::on_dtls_application_data(const char* buf, const int nb_buf) +srs_error_t SrsRtcDtls::on_dtls_application_data(const char* buf, const int nb_buf) { srs_error_t err = srs_success; @@ -332,7 +332,7 @@ srs_error_t SrsDtlsSession::on_dtls_application_data(const char* buf, const int return err; } -srs_error_t SrsDtlsSession::srtp_initialize() +srs_error_t SrsRtcDtls::srtp_initialize() { srs_error_t err = srs_success; @@ -366,7 +366,7 @@ srs_error_t SrsDtlsSession::srtp_initialize() return err; } -srs_error_t SrsDtlsSession::srtp_send_init() +srs_error_t SrsRtcDtls::srtp_send_init() { srs_error_t err = srs_success; @@ -401,7 +401,7 @@ srs_error_t SrsDtlsSession::srtp_send_init() return err; } -srs_error_t SrsDtlsSession::srtp_recv_init() +srs_error_t SrsRtcDtls::srtp_recv_init() { srs_error_t err = srs_success; @@ -433,7 +433,7 @@ srs_error_t SrsDtlsSession::srtp_recv_init() return err; } -srs_error_t SrsDtlsSession::protect_rtp(char* out_buf, const char* in_buf, int& nb_out_buf) +srs_error_t SrsRtcDtls::protect_rtp(char* out_buf, const char* in_buf, int& nb_out_buf) { srs_error_t err = srs_success; @@ -450,7 +450,7 @@ srs_error_t SrsDtlsSession::protect_rtp(char* out_buf, const char* in_buf, int& } // TODO: FIXME: Merge with protect_rtp. -srs_error_t SrsDtlsSession::protect_rtp2(void* rtp_hdr, int* len_ptr) +srs_error_t SrsRtcDtls::protect_rtp2(void* rtp_hdr, int* len_ptr) { srs_error_t err = srs_success; @@ -465,7 +465,7 @@ srs_error_t SrsDtlsSession::protect_rtp2(void* rtp_hdr, int* len_ptr) return err; } -srs_error_t SrsDtlsSession::unprotect_rtp(char* out_buf, const char* in_buf, int& nb_out_buf) +srs_error_t SrsRtcDtls::unprotect_rtp(char* out_buf, const char* in_buf, int& nb_out_buf) { srs_error_t err = srs_success; @@ -481,7 +481,7 @@ srs_error_t SrsDtlsSession::unprotect_rtp(char* out_buf, const char* in_buf, int return srs_error_new(ERROR_RTC_SRTP_UNPROTECT, "rtp unprotect failed"); } -srs_error_t SrsDtlsSession::protect_rtcp(char* out_buf, const char* in_buf, int& nb_out_buf) +srs_error_t SrsRtcDtls::protect_rtcp(char* out_buf, const char* in_buf, int& nb_out_buf) { srs_error_t err = srs_success; @@ -497,7 +497,7 @@ srs_error_t SrsDtlsSession::protect_rtcp(char* out_buf, const char* in_buf, int& return srs_error_new(ERROR_RTC_SRTP_PROTECT, "rtcp protect failed"); } -srs_error_t SrsDtlsSession::unprotect_rtcp(char* out_buf, const char* in_buf, int& nb_out_buf) +srs_error_t SrsRtcDtls::unprotect_rtcp(char* out_buf, const char* in_buf, int& nb_out_buf) { srs_error_t err = srs_success; @@ -513,7 +513,7 @@ srs_error_t SrsDtlsSession::unprotect_rtcp(char* out_buf, const char* in_buf, in return srs_error_new(ERROR_RTC_SRTP_UNPROTECT, "rtcp unprotect failed"); } -SrsRtcPackets::SrsRtcPackets(int nn_cache_max) +SrsRtcOutgoingPackets::SrsRtcOutgoingPackets(int nn_cache_max) { #if defined(SRS_DEBUG) debug_id = 0; @@ -535,13 +535,13 @@ SrsRtcPackets::SrsRtcPackets(int nn_cache_max) cache = new SrsRtpPacket2[nn_cache]; } -SrsRtcPackets::~SrsRtcPackets() +SrsRtcOutgoingPackets::~SrsRtcOutgoingPackets() { srs_freepa(cache); nn_cache = 0; } -void SrsRtcPackets::reset(bool gso, bool merge_nalus) +void SrsRtcOutgoingPackets::reset(bool gso, bool merge_nalus) { for (int i = 0; i < cursor; i++) { SrsRtpPacket2* packet = cache + i; @@ -565,7 +565,7 @@ void SrsRtcPackets::reset(bool gso, bool merge_nalus) cursor = 0; } -SrsRtpPacket2* SrsRtcPackets::fetch() +SrsRtpPacket2* SrsRtcOutgoingPackets::fetch() { if (cursor >= nn_cache) { return NULL; @@ -573,23 +573,23 @@ SrsRtpPacket2* SrsRtcPackets::fetch() return cache + (cursor++); } -SrsRtpPacket2* SrsRtcPackets::back() +SrsRtpPacket2* SrsRtcOutgoingPackets::back() { srs_assert(cursor > 0); return cache + cursor - 1; } -int SrsRtcPackets::size() +int SrsRtcOutgoingPackets::size() { return cursor; } -int SrsRtcPackets::capacity() +int SrsRtcOutgoingPackets::capacity() { return nn_cache; } -SrsRtpPacket2* SrsRtcPackets::at(int index) +SrsRtpPacket2* SrsRtcOutgoingPackets::at(int index) { srs_assert(index < cursor); return cache + index; @@ -600,7 +600,7 @@ SrsRtcPlayer::SrsRtcPlayer(SrsRtcSession* s, int parent_cid) _parent_cid = parent_cid; trd = new SrsDummyCoroutine(); - rtc_session = s; + session_ = s; gso = false; merge_nalus = false; @@ -657,7 +657,7 @@ srs_error_t SrsRtcPlayer::on_reload_rtc_server() srs_error_t SrsRtcPlayer::on_reload_vhost_play(string vhost) { - SrsRequest* req = rtc_session->req; + SrsRequest* req = session_->req; if (req->vhost != vhost) { return srs_success; @@ -711,7 +711,7 @@ srs_error_t SrsRtcPlayer::cycle() srs_error_t err = srs_success; SrsSource* source = NULL; - SrsRequest* req = rtc_session->req; + SrsRequest* req = session_->req; // TODO: FIXME: Should refactor it, directly use http server as handler. ISrsSourceHandler* handler = _srs_hybrid->srs()->instance(); @@ -742,7 +742,7 @@ srs_error_t SrsRtcPlayer::cycle() mw_msgs = _srs_config->get_mw_msgs(req->vhost, realtime, true); // We merged write more messages, so we need larger queue. - ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); + ISrsUdpSender* sender = session_->sendonly_skt->sender(); if (mw_msgs > 2) { sender->set_extra_ratio(150); } else if (mw_msgs > 0) { @@ -750,15 +750,15 @@ srs_error_t SrsRtcPlayer::cycle() } srs_trace("RTC source url=%s, source_id=[%d][%d], encrypt=%d, realtime=%d, mw_sleep=%dms, mw_msgs=%d", req->get_stream_url().c_str(), - ::getpid(), source->source_id(), rtc_session->encrypt, realtime, srsu2msi(mw_sleep), mw_msgs); + ::getpid(), source->source_id(), session_->encrypt, realtime, srsu2msi(mw_sleep), mw_msgs); SrsMessageArray msgs(SRS_PERF_MW_MSGS); - SrsRtcPackets pkts(SRS_PERF_RTC_RTP_PACKETS); + SrsRtcOutgoingPackets pkts(SRS_PERF_RTC_RTP_PACKETS); SrsPithyPrint* pprint = SrsPithyPrint::create_rtc_play(); SrsAutoFree(SrsPithyPrint, pprint); - srs_trace("rtc session=%s, start play", rtc_session->id().c_str()); + srs_trace("rtc session=%s, start play", session_->id().c_str()); bool stat_enabled = _srs_config->get_rtc_server_perf_stat(); SrsStatistic* stat = SrsStatistic::instance(); @@ -834,12 +834,12 @@ srs_error_t SrsRtcPlayer::cycle() } srs_error_t SrsRtcPlayer::send_messages( - SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets + SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcOutgoingPackets& packets ) { srs_error_t err = srs_success; // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { + if (!session_->dtls_) { return err; } @@ -867,11 +867,11 @@ srs_error_t SrsRtcPlayer::send_messages( } srs_error_t SrsRtcPlayer::messages_to_packets( - SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets + SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcOutgoingPackets& packets ) { srs_error_t err = srs_success; - ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); + ISrsUdpSender* sender = session_->sendonly_skt->sender(); for (int i = 0; i < nb_msgs; i++) { SrsSharedPtrMessage* msg = msgs[i]; @@ -951,13 +951,13 @@ srs_error_t SrsRtcPlayer::messages_to_packets( return err; } -srs_error_t SrsRtcPlayer::send_packets(SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::send_packets(SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; // Cache the encrypt flag and sender. - bool encrypt = rtc_session->encrypt; - ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); + bool encrypt = session_->encrypt; + ISrsUdpSender* sender = session_->sendonly_skt->sender(); int nn_packets = packets.size(); for (int i = 0; i < nn_packets; i++) { @@ -991,7 +991,7 @@ srs_error_t SrsRtcPlayer::send_packets(SrsRtcPackets& packets) // Whether encrypt the RTP bytes. if (encrypt) { int nn_encrypt = (int)iov->iov_len; - if ((err = rtc_session->dtls_session->protect_rtp2(iov->iov_base, &nn_encrypt)) != srs_success) { + if ((err = session_->dtls_->protect_rtp2(iov->iov_base, &nn_encrypt)) != srs_success) { return srs_error_wrap(err, "srtp protect"); } iov->iov_len = (size_t)nn_encrypt; @@ -1000,8 +1000,8 @@ srs_error_t SrsRtcPlayer::send_packets(SrsRtcPackets& packets) packets.nn_rtp_bytes += (int)iov->iov_len; // Set the address and control information. - sockaddr_in* addr = (sockaddr_in*)rtc_session->sendonly_skt->peer_addr(); - socklen_t addrlen = (socklen_t)rtc_session->sendonly_skt->peer_addrlen(); + sockaddr_in* addr = (sockaddr_in*)session_->sendonly_skt->peer_addr(); + socklen_t addrlen = (socklen_t)session_->sendonly_skt->peer_addrlen(); mhdr->msg_hdr.msg_name = (sockaddr_in*)addr; mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen; @@ -1019,13 +1019,13 @@ srs_error_t SrsRtcPlayer::send_packets(SrsRtcPackets& packets) } // TODO: FIXME: We can gather and pad audios, because they have similar size. -srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; // Cache the encrypt flag and sender. - bool encrypt = rtc_session->encrypt; - ISrsUdpSender* sender = rtc_session->sendonly_skt->sender(); + bool encrypt = session_->encrypt; + ISrsUdpSender* sender = session_->sendonly_skt->sender(); // Previous handler, if has the same size, we can use GSO. srs_mmsghdr* gso_mhdr = NULL; int gso_size = 0; int gso_encrypt = 0; int gso_cursor = 0; @@ -1138,7 +1138,7 @@ srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcPackets& packets) // Whether encrypt the RTP bytes. if (encrypt) { int nn_encrypt = (int)iov->iov_len; - if ((err = rtc_session->dtls_session->protect_rtp2(iov->iov_base, &nn_encrypt)) != srs_success) { + if ((err = session_->dtls_->protect_rtp2(iov->iov_base, &nn_encrypt)) != srs_success) { return srs_error_wrap(err, "srtp protect"); } iov->iov_len = (size_t)nn_encrypt; @@ -1178,8 +1178,8 @@ srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcPackets& packets) if (do_send) { // Set the address and control information. - sockaddr_in* addr = (sockaddr_in*)rtc_session->sendonly_skt->peer_addr(); - socklen_t addrlen = (socklen_t)rtc_session->sendonly_skt->peer_addrlen(); + sockaddr_in* addr = (sockaddr_in*)session_->sendonly_skt->peer_addr(); + socklen_t addrlen = (socklen_t)session_->sendonly_skt->peer_addrlen(); mhdr->msg_hdr.msg_name = (sockaddr_in*)addr; mhdr->msg_hdr.msg_namelen = (socklen_t)addrlen; @@ -1222,7 +1222,7 @@ srs_error_t SrsRtcPlayer::send_packets_gso(SrsRtcPackets& packets) return err; } -srs_error_t SrsRtcPlayer::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_nalus(SrsSharedPtrMessage* msg, SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; @@ -1312,7 +1312,7 @@ srs_error_t SrsRtcPlayer::package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& return err; } -srs_error_t SrsRtcPlayer::package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload) +srs_error_t SrsRtcPlayer::package_opus(SrsSample* sample, SrsRtcOutgoingPackets& packets, int nn_max_payload) { srs_error_t err = srs_success; @@ -1348,7 +1348,7 @@ srs_error_t SrsRtcPlayer::package_opus(SrsSample* sample, SrsRtcPackets& packets return err; } -srs_error_t SrsRtcPlayer::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; @@ -1389,7 +1389,7 @@ srs_error_t SrsRtcPlayer::package_fu_a(SrsSharedPtrMessage* msg, SrsSample* samp } // Single NAL Unit Packet @see https://tools.ietf.org/html/rfc6184#section-5.6 -srs_error_t SrsRtcPlayer::package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; @@ -1409,7 +1409,7 @@ srs_error_t SrsRtcPlayer::package_single_nalu(SrsSharedPtrMessage* msg, SrsSampl return err; } -srs_error_t SrsRtcPlayer::package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets) +srs_error_t SrsRtcPlayer::package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcOutgoingPackets& packets) { srs_error_t err = srs_success; @@ -1468,7 +1468,7 @@ SrsRtcPublisher::SrsRtcPublisher(SrsRtcSession* session) { report_timer = new SrsHourGlass(this, 200 * SRS_UTIME_MILLISECONDS); - rtc_session = session; + session_ = session; video_queue_ = new SrsRtpVideoQueue(1000); video_nack_ = new SrsRtpNackForReceiver(video_queue_, 1000 * 2 / 3); audio_queue_ = new SrsRtpAudioQueue(100); @@ -1683,7 +1683,7 @@ srs_error_t SrsRtcPublisher::on_rtcp_xr(char* buf, int nb_buf) void SrsRtcPublisher::check_send_nacks(SrsRtpNackForReceiver* nack, uint32_t ssrc) { // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { + if (!session_->dtls_) { return; } @@ -1713,9 +1713,9 @@ void SrsRtcPublisher::check_send_nacks(SrsRtpNackForReceiver* nack, uint32_t ssr int nb_protected_buf = stream.pos(); // FIXME: Merge nack rtcp into one packets. - if (rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { + if (session_->dtls_->protect_rtcp(protected_buf, stream.data(), nb_protected_buf) == srs_success) { // TODO: FIXME: Check error. - rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); + session_->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); } ++iter; @@ -1727,7 +1727,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(uint32_t ssrc, SrsRtpQueue* rtp_queue) srs_error_t err = srs_success; // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { + if (!session_->dtls_) { return err; } @@ -1768,12 +1768,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_rr(uint32_t ssrc, SrsRtpQueue* rtp_queue) char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); - if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + if ((err = session_->dtls_->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { return srs_error_wrap(err, "protect rtcp rr"); } // TDOO: FIXME: Check error. - rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); + session_->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } @@ -1782,7 +1782,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(uint32_t ssrc) srs_error_t err = srs_success; // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { + if (!session_->dtls_) { return err; } @@ -1828,12 +1828,12 @@ srs_error_t SrsRtcPublisher::send_rtcp_xr_rrtr(uint32_t ssrc) char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); - if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + if ((err = session_->dtls_->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { return srs_error_wrap(err, "protect rtcp xr"); } // TDOO: FIXME: Check error. - rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); + session_->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } @@ -1843,7 +1843,7 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(uint32_t ssrc) srs_error_t err = srs_success; // If DTLS is not OK, drop all messages. - if (!rtc_session->dtls_session) { + if (!session_->dtls_) { return err; } @@ -1857,20 +1857,20 @@ srs_error_t SrsRtcPublisher::send_rtcp_fb_pli(uint32_t ssrc) srs_trace("RTC PLI ssrc=%u", ssrc); - if (rtc_session->blackhole && rtc_session->blackhole_addr && rtc_session->blackhole_stfd) { + if (session_->blackhole && session_->blackhole_addr && session_->blackhole_stfd) { // Ignore any error for black-hole. - void* p = stream.data(); int len = stream.pos(); SrsRtcSession* s = rtc_session; + void* p = stream.data(); int len = stream.pos(); SrsRtcSession* s = session_; srs_sendto(s->blackhole_stfd, p, len, (sockaddr*)s->blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } char protected_buf[kRtpPacketSize]; int nb_protected_buf = stream.pos(); - if ((err = rtc_session->dtls_session->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { + if ((err = session_->dtls_->protect_rtcp(protected_buf, stream.data(), nb_protected_buf)) != srs_success) { return srs_error_wrap(err, "protect rtcp psfb pli"); } // TDOO: FIXME: Check error. - rtc_session->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); + session_->sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); return err; } @@ -2224,7 +2224,7 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& void SrsRtcPublisher::request_keyframe() { int scid = _srs_context->get_id(); - int pcid = rtc_session->context_id(); + int pcid = session_->context_id(); srs_trace("RTC play=[%d][%d] request keyframe from publish=[%d][%d]", ::getpid(), scid, ::getpid(), pcid); video_queue_->request_keyframe(); @@ -2251,11 +2251,11 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s) encrypt = true; source_ = NULL; - publisher = NULL; - player = NULL; + publisher_ = NULL; + player_ = NULL; sendonly_skt = NULL; - rtc_server = s; - dtls_session = new SrsDtlsSession(this); + server_ = s; + dtls_ = new SrsRtcDtls(this); session_state = INIT; last_stun_time = 0; @@ -2268,9 +2268,9 @@ SrsRtcSession::SrsRtcSession(SrsRtcServer* s) SrsRtcSession::~SrsRtcSession() { - srs_freep(player); - srs_freep(publisher); - srs_freep(dtls_session); + srs_freep(player_); + srs_freep(publisher_); + srs_freep(dtls_); srs_freep(req); srs_close_stfd(blackhole_stfd); srs_freep(blackhole_addr); @@ -2348,7 +2348,7 @@ srs_error_t SrsRtcSession::initialize(SrsSource* source, SrsRequest* r, bool is_ is_publisher_ = is_publisher; source_ = source; - if ((err = dtls_session->initialize(req)) != srs_success) { + if ((err = dtls_->initialize(req)) != srs_success) { return srs_error_wrap(err, "init"); } @@ -2415,20 +2415,20 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r) srs_error_t SrsRtcSession::on_dtls(char* data, int nb_data) { - return dtls_session->on_dtls(data, nb_data); + return dtls_->on_dtls(data, nb_data); } srs_error_t SrsRtcSession::on_rtcp(char* data, int nb_data) { srs_error_t err = srs_success; - if (dtls_session == NULL) { + if (dtls_ == NULL) { return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); } char unprotected_buf[kRtpPacketSize]; int nb_unprotected_buf = nb_data; - if ((err = dtls_session->unprotect_rtcp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { + if ((err = dtls_->unprotect_rtcp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { return srs_error_wrap(err, "rtcp unprotect failed"); } @@ -2503,17 +2503,17 @@ srs_error_t SrsRtcSession::on_rtp(char* data, int nb_data) { srs_error_t err = srs_success; - if (publisher == NULL) { + if (publisher_ == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - if (dtls_session == NULL) { + if (dtls_ == NULL) { return srs_error_new(ERROR_RTC_RTCP, "recv unexpect rtp packet before dtls done"); } int nb_unprotected_buf = nb_data; char* unprotected_buf = new char[kRtpPacketSize]; - if ((err = dtls_session->unprotect_rtp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { + if ((err = dtls_->unprotect_rtp(unprotected_buf, data, nb_unprotected_buf)) != srs_success) { srs_freepa(unprotected_buf); return srs_error_wrap(err, "rtp unprotect failed"); } @@ -2524,7 +2524,7 @@ srs_error_t SrsRtcSession::on_rtp(char* data, int nb_data) srs_sendto(blackhole_stfd, p, len, (sockaddr*)blackhole_addr, sizeof(sockaddr_in), SRS_UTIME_NO_TIMEOUT); } - return publisher->on_rtp(unprotected_buf, nb_unprotected_buf); + return publisher_->on_rtp(unprotected_buf, nb_unprotected_buf); } srs_error_t SrsRtcSession::on_connection_established() @@ -2551,8 +2551,8 @@ srs_error_t SrsRtcSession::start_play() { srs_error_t err = srs_success; - srs_freep(player); - player = new SrsRtcPlayer(this, _srs_context->get_id()); + srs_freep(player_); + player_ = new SrsRtcPlayer(this, _srs_context->get_id()); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2569,11 +2569,11 @@ srs_error_t SrsRtcSession::start_play() } } - if ((err = player->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { + if ((err = player_->initialize(video_ssrc, audio_ssrc, video_payload_type, audio_payload_type)) != srs_success) { return srs_error_wrap(err, "SrsRtcPlayer init"); } - if ((err = player->start()) != srs_success) { + if ((err = player_->start()) != srs_success) { return srs_error_wrap(err, "start SrsRtcPlayer"); } @@ -2584,10 +2584,10 @@ srs_error_t SrsRtcSession::start_publish() { srs_error_t err = srs_success; - srs_freep(publisher); - publisher = new SrsRtcPublisher(this); + srs_freep(publisher_); + publisher_ = new SrsRtcPublisher(this); // Request PLI for exists players? - //publisher->request_keyframe(); + //publisher_->request_keyframe(); uint32_t video_ssrc = 0; uint32_t audio_ssrc = 0; @@ -2605,7 +2605,7 @@ srs_error_t SrsRtcSession::start_publish() } // FIXME: err process. - if ((err = publisher->initialize(video_ssrc, audio_ssrc, req)) != srs_success) { + if ((err = publisher_->initialize(video_ssrc, audio_ssrc, req)) != srs_success) { return srs_error_wrap(err, "rtc publisher init"); } @@ -2671,7 +2671,7 @@ srs_error_t SrsRtcSession::on_binding_request(SrsStunPacket* r) set_session_state(DOING_DTLS_HANDSHAKE); peer_id = sendonly_skt->get_peer_id(); - rtc_server->insert_into_id_sessions(peer_id, this); + server_->insert_into_id_sessions(peer_id, this); set_session_state(DOING_DTLS_HANDSHAKE); srs_trace("rtc session=%s, STUN done, waitting DTLS handshake.", id().c_str()); @@ -2690,7 +2690,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) { srs_error_t err = srs_success; - if (!dtls_session) { + if (!dtls_) { return err; } @@ -2764,7 +2764,7 @@ srs_error_t SrsRtcSession::on_rtcp_feedback(char* buf, int nb_buf) // TODO: FIXME: Check error. pkt->encode(&buf); - dtls_session->protect_rtp(protected_buf, protected_buf, nb_protected_buf); + dtls_->protect_rtp(protected_buf, protected_buf, nb_protected_buf); sendonly_skt->sendto(protected_buf, nb_protected_buf, 0); } @@ -2823,20 +2823,20 @@ srs_error_t SrsRtcSession::on_rtcp_ps_feedback(char* buf, int nb_buf) srs_error_t SrsRtcSession::on_rtcp_xr(char* buf, int nb_buf) { - if (publisher == NULL) { + if (publisher_ == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return publisher->on_rtcp_xr(buf, nb_buf); + return publisher_->on_rtcp_xr(buf, nb_buf); } srs_error_t SrsRtcSession::on_rtcp_sender_report(char* buf, int nb_buf) { - if (publisher == NULL) { + if (publisher_ == NULL) { return srs_error_new(ERROR_RTC_RTCP, "rtc publisher null"); } - return publisher->on_rtcp_sender_report(buf, nb_buf); + return publisher_->on_rtcp_sender_report(buf, nb_buf); } srs_error_t SrsRtcSession::on_rtcp_receiver_report(char* buf, int nb_buf) @@ -3275,12 +3275,12 @@ srs_error_t SrsRtcServer::on_udp_packet(SrsUdpMuxSocket* skt) srs_error_t err = srs_success; char* data = skt->data(); int size = skt->size(); - SrsRtcSession* rtc_session = find_rtc_session_by_peer_id(skt->get_peer_id()); + SrsRtcSession* session = find_session_by_peer_id(skt->get_peer_id()); - if (rtc_session) { + if (session) { // Now, we got the RTC session to handle the packet, switch to its context // to make all logs write to the "correct" pid+cid. - rtc_session->switch_to_context(); + session->switch_to_context(); } // For STUN, the peer address may change. @@ -3292,32 +3292,32 @@ srs_error_t SrsRtcServer::on_udp_packet(SrsUdpMuxSocket* skt) srs_verbose("recv stun packet from %s, use-candidate=%d, ice-controlled=%d, ice-controlling=%d", skt->get_peer_id().c_str(), sr.get_use_candidate(), sr.get_ice_controlled(), sr.get_ice_controlling()); - if (!rtc_session) { - rtc_session = find_rtc_session_by_username(sr.get_username()); - if (rtc_session) { - rtc_session->switch_to_context(); + if (!session) { + session = find_session_by_username(sr.get_username()); + if (session) { + session->switch_to_context(); } } - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, stun username=%s, peer_id=%s", + if (session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find session, stun username=%s, peer_id=%s", sr.get_username().c_str(), skt->get_peer_id().c_str()); } - return rtc_session->on_stun(skt, &sr); + return session->on_stun(skt, &sr); } // For DTLS, RTCP or RTP, which does not support peer address changing. - if (rtc_session == NULL) { - return srs_error_new(ERROR_RTC_STUN, "can not find rtc_session, peer_id=%s", skt->get_peer_id().c_str()); + if (session == NULL) { + return srs_error_new(ERROR_RTC_STUN, "can not find session, peer_id=%s", skt->get_peer_id().c_str()); } if (is_dtls((uint8_t*)data, size)) { - return rtc_session->on_dtls(data, size); + return session->on_dtls(data, size); } else if (is_rtp_or_rtcp((uint8_t*)data, size)) { if (is_rtcp((uint8_t*)data, size)) { - return rtc_session->on_rtcp(data, size); + return session->on_rtcp(data, size); } - return rtc_session->on_rtp(data, size); + return session->on_rtp(data, size); } return srs_error_new(ERROR_RTC_UDP, "unknown udp packet type"); @@ -3340,7 +3340,7 @@ srs_error_t SrsRtcServer::listen_api() return err; } -srs_error_t SrsRtcServer::create_rtc_session( +srs_error_t SrsRtcServer::create_session( SrsRequest* req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const std::string& mock_eip, bool publish, SrsRtcSession** psession ) { @@ -3404,9 +3404,9 @@ srs_error_t SrsRtcServer::create_rtc_session( return err; } -bool SrsRtcServer::insert_into_id_sessions(const string& peer_id, SrsRtcSession* rtc_session) +bool SrsRtcServer::insert_into_id_sessions(const string& peer_id, SrsRtcSession* session) { - return map_id_session.insert(make_pair(peer_id, rtc_session)).second; + return map_id_session.insert(make_pair(peer_id, session)).second; } void SrsRtcServer::check_and_clean_timeout_session() @@ -3440,7 +3440,7 @@ int SrsRtcServer::nn_sessions() return (int)map_username_session.size(); } -SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) +SrsRtcSession* SrsRtcServer::find_session_by_peer_id(const string& peer_id) { map::iterator iter = map_id_session.find(peer_id); if (iter == map_id_session.end()) { @@ -3450,7 +3450,7 @@ SrsRtcSession* SrsRtcServer::find_rtc_session_by_peer_id(const string& peer_id) return iter->second; } -SrsRtcSession* SrsRtcServer::find_rtc_session_by_username(const std::string& username) +SrsRtcSession* SrsRtcServer::find_session_by_username(const std::string& username) { map::iterator iter = map_username_session.find(username); if (iter == map_username_session.end()) { diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 5522c986f..9babd62e0 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -103,10 +103,10 @@ enum SrsRtcSessionStateType CLOSED = 4, }; -class SrsDtlsSession +class SrsRtcDtls { private: - SrsRtcSession* rtc_session; + SrsRtcSession* session_; SSL* dtls; BIO* bio_in; @@ -121,8 +121,8 @@ private: bool handshake_done; public: - SrsDtlsSession(SrsRtcSession* s); - virtual ~SrsDtlsSession(); + SrsRtcDtls(SrsRtcSession* s); + virtual ~SrsRtcDtls(); srs_error_t initialize(SrsRequest* r); @@ -143,8 +143,8 @@ private: srs_error_t srtp_recv_init(); }; -// A group of RTP packets. -class SrsRtcPackets +// A group of RTP packets for outgoing(send to players). +class SrsRtcOutgoingPackets { public: bool use_gso; @@ -183,8 +183,8 @@ private: int nn_cache; SrsRtpPacket2* cache; public: - SrsRtcPackets(int nn_cache_max); - virtual ~SrsRtcPackets(); + SrsRtcOutgoingPackets(int nn_cache_max); + virtual ~SrsRtcOutgoingPackets(); public: void reset(bool gso, bool merge_nalus); SrsRtpPacket2* fetch(); @@ -200,7 +200,7 @@ protected: SrsCoroutine* trd; int _parent_cid; private: - SrsRtcSession* rtc_session; + SrsRtcSession* session_; uint32_t video_ssrc; uint32_t audio_ssrc; uint16_t video_payload_type; @@ -238,17 +238,17 @@ public: public: virtual srs_error_t cycle(); private: - srs_error_t send_messages(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets); - srs_error_t messages_to_packets(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcPackets& packets); - srs_error_t send_packets(SrsRtcPackets& packets); - srs_error_t send_packets_gso(SrsRtcPackets& packets); + srs_error_t send_messages(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcOutgoingPackets& packets); + srs_error_t messages_to_packets(SrsSource* source, SrsSharedPtrMessage** msgs, int nb_msgs, SrsRtcOutgoingPackets& packets); + srs_error_t send_packets(SrsRtcOutgoingPackets& packets); + srs_error_t send_packets_gso(SrsRtcOutgoingPackets& packets); private: - srs_error_t package_opus(SrsSample* sample, SrsRtcPackets& packets, int nn_max_payload); + srs_error_t package_opus(SrsSample* sample, SrsRtcOutgoingPackets& packets, int nn_max_payload); private: - srs_error_t package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcPackets& packets); - srs_error_t package_nalus(SrsSharedPtrMessage* msg, SrsRtcPackets& packets); - srs_error_t package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcPackets& packets); - srs_error_t package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcPackets& packets); + srs_error_t package_fu_a(SrsSharedPtrMessage* msg, SrsSample* sample, int fu_payload_size, SrsRtcOutgoingPackets& packets); + srs_error_t package_nalus(SrsSharedPtrMessage* msg, SrsRtcOutgoingPackets& packets); + srs_error_t package_single_nalu(SrsSharedPtrMessage* msg, SrsSample* sample, SrsRtcOutgoingPackets& packets); + srs_error_t package_stap_a(SrsSource* source, SrsSharedPtrMessage* msg, SrsRtcOutgoingPackets& packets); }; class SrsRtcPublisher : virtual public ISrsHourGlass, virtual public ISrsRtpPacketDecodeHandler @@ -256,7 +256,7 @@ class SrsRtcPublisher : virtual public ISrsHourGlass, virtual public ISrsRtpPack private: SrsHourGlass* report_timer; private: - SrsRtcSession* rtc_session; + SrsRtcSession* session_; uint32_t video_ssrc; uint32_t audio_ssrc; private: @@ -301,15 +301,15 @@ public: class SrsRtcSession { - friend class SrsDtlsSession; + friend class SrsRtcDtls; friend class SrsRtcPlayer; friend class SrsRtcPublisher; private: - SrsRtcServer* rtc_server; + SrsRtcServer* server_; SrsRtcSessionStateType session_state; - SrsDtlsSession* dtls_session; - SrsRtcPlayer* player; - SrsRtcPublisher* publisher; + SrsRtcDtls* dtls_; + SrsRtcPlayer* player_; + SrsRtcPublisher* publisher_; bool is_publisher_; private: SrsUdpMuxSocket* sendonly_skt; @@ -438,16 +438,16 @@ public: virtual srs_error_t on_udp_packet(SrsUdpMuxSocket* skt); public: virtual srs_error_t listen_api(); - srs_error_t create_rtc_session( + srs_error_t create_session( SrsRequest* req, const SrsSdp& remote_sdp, SrsSdp& local_sdp, const std::string& mock_eip, bool publish, SrsRtcSession** psession ); - bool insert_into_id_sessions(const std::string& peer_id, SrsRtcSession* rtc_session); + bool insert_into_id_sessions(const std::string& peer_id, SrsRtcSession* session); void check_and_clean_timeout_session(); int nn_sessions(); private: - SrsRtcSession* find_rtc_session_by_username(const std::string& ufrag); - SrsRtcSession* find_rtc_session_by_peer_id(const std::string& peer_id); + SrsRtcSession* find_session_by_username(const std::string& ufrag); + SrsRtcSession* find_session_by_peer_id(const std::string& peer_id); // interface ISrsHourGlass public: virtual srs_error_t notify(int type, srs_utime_t interval, srs_utime_t tick); From a812183144f412acbb99e8e5b82ae16d82fc2a0d Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 14:28:51 +0800 Subject: [PATCH 50/79] Refactor the RTC sender audio queue --- trunk/research/players/rtc_publisher.html | 6 ++--- trunk/src/app/srs_app_rtc_conn.cpp | 14 +++++------- trunk/src/app/srs_app_rtp_queue.cpp | 27 ++++++----------------- trunk/src/app/srs_app_rtp_queue.hpp | 5 +---- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 0035a20aa..bb33c9dec 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -72,9 +72,9 @@ var constraints = { "audio": true, "video": { - "width": { "min": "480", "max": "1920" }, - "height": { "min": "320", "max": "1080" }, - "frameRate": { "min": "15", "max": "60" } + "width": { "min": "480", "max": "720" }, + "height": { "min": "320", "max": "480" }, + "frameRate": { "min": "15", "max": "30" } } }; navigator.mediaDevices.getUserMedia( diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index df078d71e..19a8d24e1 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1936,20 +1936,16 @@ srs_error_t SrsRtcPublisher::collect_audio_frames() { srs_error_t err = srs_success; - std::vector > frames; + std::vector frames; audio_queue_->collect_frames(audio_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { - vector& packets = frames[i]; + SrsRtpPacket2* pkt = frames[i]; - for (size_t j = 0; j < packets.size(); ++j) { - SrsRtpPacket2* pkt = packets[j]; + // TODO: FIXME: Check error. + do_collect_audio_frame(pkt); - // TODO: FIXME: Check error. - do_collect_audio_frame(pkt); - - srs_freep(pkt); - } + srs_freep(pkt); } return err; diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index a3831949f..511ff90a1 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -408,21 +408,7 @@ SrsRtpAudioQueue::~SrsRtpAudioQueue() { } -void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames) -{ - collect_packet(frames, nack); - - if (queue_->overflow()) { - on_overflow(nack); - } -} - -void SrsRtpAudioQueue::on_overflow(SrsRtpNackForReceiver* nack) -{ - queue_->advance_to(queue_->high()); -} - -void SrsRtpAudioQueue::collect_packet(vector >& frames, SrsRtpNackForReceiver* nack) +void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, vector& frames) { // When done, s point to the next available packet. uint16_t next = queue_->low(); @@ -437,12 +423,8 @@ void SrsRtpAudioQueue::collect_packet(vector >& frames, S } // OK, collect packet to frame. - vector frame; - frame.push_back(pkt); - - // Done, we got the last packet of frame. nn_collected_frames++; - frames.push_back(frame); + frames.push_back(pkt); } if (queue_->low() != next) { @@ -452,6 +434,11 @@ void SrsRtpAudioQueue::collect_packet(vector >& frames, S srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); queue_->advance_to(next); } + + // For audio, if overflow, clear all packets. + if (queue_->overflow()) { + queue_->advance_to(queue_->high()); + } } SrsRtpVideoQueue::SrsRtpVideoQueue(int capacity) : SrsRtpQueue(capacity) diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index a605df185..445b2c6a7 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -193,10 +193,7 @@ public: SrsRtpAudioQueue(int capacity); virtual ~SrsRtpAudioQueue(); public: - virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames); -private: - virtual void on_overflow(SrsRtpNackForReceiver* nack); - virtual void collect_packet(std::vector >& frames, SrsRtpNackForReceiver* nack); + virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector& frames); }; class SrsRtpVideoQueue : public SrsRtpQueue From 47ed16eda14698f2b02a8c1596227b540b773d7c Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 17:41:00 +0800 Subject: [PATCH 51/79] Refactor RTC publisher queue, covert FU-A to RAW. --- trunk/src/app/srs_app_rtc_conn.cpp | 136 ++++----------------------- trunk/src/app/srs_app_rtc_conn.hpp | 7 +- trunk/src/app/srs_app_rtp_queue.cpp | 139 +++++++++++++++++++++++----- trunk/src/app/srs_app_rtp_queue.hpp | 7 +- 4 files changed, 139 insertions(+), 150 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 19a8d24e1..2cf983012 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1924,18 +1924,14 @@ void SrsRtcPublisher::on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* bu srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) { + srs_error_t err = srs_success; + // TODO: FIXME: Error check. audio_queue_->consume(audio_nack_, pkt); check_send_nacks(audio_nack_, audio_ssrc); - return collect_audio_frames(); -} - -srs_error_t SrsRtcPublisher::collect_audio_frames() -{ - srs_error_t err = srs_success; - + // Collect all audio frames. std::vector frames; audio_queue_->collect_frames(audio_nack_, frames); @@ -1943,7 +1939,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frames() SrsRtpPacket2* pkt = frames[i]; // TODO: FIXME: Check error. - do_collect_audio_frame(pkt); + collect_audio_frame(pkt); srs_freep(pkt); } @@ -1951,7 +1947,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frames() return err; } -srs_error_t SrsRtcPublisher::do_collect_audio_frame(SrsRtpPacket2* pkt) +srs_error_t SrsRtcPublisher::collect_audio_frame(SrsRtpPacket2* pkt) { srs_error_t err = srs_success; @@ -1989,28 +1985,6 @@ srs_error_t SrsRtcPublisher::do_collect_audio_frame(SrsRtpPacket2* pkt) srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) { - uint8_t v = (uint8_t)pkt->nalu_type; - if (v == kFuA) { - SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); - if (!payload) { - srs_freep(pkt); - return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); - } - - pkt->video_is_first_packet = payload->start; - pkt->video_is_last_packet = payload->end; - pkt->video_is_idr = (payload->nalu_type == SrsAvcNaluTypeIDR); - } else { - pkt->video_is_first_packet = true; - pkt->video_is_last_packet = true; - - if (v == kStapA) { - pkt->video_is_idr = true; - } else { - pkt->video_is_idr = (pkt->nalu_type == SrsAvcNaluTypeIDR); - } - } - // TODO: FIXME: Error check. video_queue_->consume(video_nack_, pkt); @@ -2021,110 +1995,35 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) check_send_nacks(video_nack_, video_ssrc); - return collect_video_frames(); -} - -srs_error_t SrsRtcPublisher::collect_video_frames() -{ - std::vector > frames; + // Collect video frames. + std::vector frames; video_queue_->collect_frames(video_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { - vector& packets = frames[i]; - if (packets.empty()) { - continue; - } + SrsRtpPacket2* pkt = frames[i]; // TODO: FIXME: Check error. - do_collect_video_frame(packets); + collect_video_frame(pkt); - for (size_t j = 0; j < packets.size(); ++j) { - SrsRtpPacket2* pkt = packets[j]; - srs_freep(pkt); - } + srs_freep(pkt); } return srs_success; } -srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& packets) +srs_error_t SrsRtcPublisher::collect_video_frame(SrsRtpPacket2* pkt) { srs_error_t err = srs_success; - // Although a video frame may contain many packets, they share the same NALU type. - SrsRtpPacket2* head = packets.at(0); - SrsAvcNaluType nalu_type = head->nalu_type; - int64_t timestamp = head->rtp_header.get_timestamp(); + int64_t timestamp = pkt->rtp_header.get_timestamp(); - // For FU-A or STAP-A, there must be more than one packets. - if (nalu_type == (SrsAvcNaluType)kFuA) { - if (packets.size() < 2) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A/STAP-A %#x %d packets", nalu_type, packets.size()); - } - } else { - // For others type, should be one packet for one frame. - if (packets.size() != 1) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "NonFU-A %d packets", packets.size()); - } - } - - // For FU-A, group packets to one video frame. - if (nalu_type == (SrsAvcNaluType)kFuA) { - int nn_nalus = 0; - for (size_t i = 0; i < packets.size(); ++i) { - SrsRtpPacket2* pkt = packets[i]; - SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); - if (!payload) { - return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); - } - nn_nalus += payload->size; - } - if (!nn_nalus) { - return err; - } - - // TODO: FIXME: Directly covert to sample for performance. - // 5 bytes FLV tag header. - // 4 bytes NALU IBMF header, define by sequence header. - // 1 byte NALU header. - nn_nalus += 1; - int nn_payload = nn_nalus + 5 + 4; - char* data = new char[nn_payload]; - SrsBuffer buf(data, nn_payload); - - SrsRtpFUAPayload2* head_payload = dynamic_cast(head->payload); - if (head_payload->nalu_type == SrsAvcNaluTypeIDR) { - buf.write_1bytes(0x17); // Keyframe. - srs_trace("RTC got IDR %d bytes", nn_nalus); - } else { - buf.write_1bytes(0x27); // Not Keyframe. - } - buf.write_1bytes(0x01); // Not Sequence header. - buf.write_3bytes(0x00); // CTS. - buf.write_4bytes(nn_nalus); - - buf.write_1bytes(head_payload->nri | head_payload->nalu_type); // NALU header. - - for (size_t i = 0; i < packets.size(); ++i) { - SrsRtpPacket2* pkt = packets[i]; - SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); - buf.write_bytes(payload->payload, payload->size); - } - - SrsMessageHeader header; - header.message_type = RTMP_MSG_VideoMessage; - // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = (timestamp / 90) & 0x3fffffff; - SrsCommonMessage* shared_video = new SrsCommonMessage(); - SrsAutoFree(SrsCommonMessage, shared_video); - // TODO: FIXME: Check error. - shared_video->create(&header, data, nn_payload); - return source->on_video(shared_video); + // No FU-A, because we convert it to RAW RTP packet. + if (pkt->nalu_type == (SrsAvcNaluType)kFuA) { + return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid FU-A"); } // For STAP-A, it must be SPS/PPS, and only one packet. - if (nalu_type == (SrsAvcNaluType)kStapA) { - SrsRtpPacket2* pkt = head; + if (pkt->nalu_type == (SrsAvcNaluType)kStapA) { SrsRtpSTAPPayload* payload = dynamic_cast(pkt->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload"); @@ -2178,7 +2077,6 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& } // For RAW NALU, should be one RAW packet. - SrsRtpPacket2* pkt = head; SrsRtpRawPayload* payload = dynamic_cast(pkt->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "RAW-NALU payload"); @@ -2194,7 +2092,7 @@ srs_error_t SrsRtcPublisher::do_collect_video_frame(std::vector& char* data = new char[nn_payload]; SrsBuffer buf(data, nn_payload); - if (nalu_type == SrsAvcNaluTypeIDR) { + if (pkt->nalu_type == SrsAvcNaluTypeIDR) { buf.write_1bytes(0x17); // Keyframe. srs_trace("RTC got IDR %d bytes", nn_payload); } else { diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 9babd62e0..2c3474b46 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -58,6 +58,7 @@ class SrsRtpVideoQueue; class SrsRtpPacket2; class ISrsCodec; class SrsRtpNackForReceiver; +class SrsRtpIncommingVideoFrame; const uint8_t kSR = 200; const uint8_t kRR = 201; @@ -287,11 +288,9 @@ public: virtual void on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsCodec** ppayload); private: srs_error_t on_audio(SrsRtpPacket2* pkt); - srs_error_t collect_audio_frames(); - srs_error_t do_collect_audio_frame(SrsRtpPacket2* packet); + srs_error_t collect_audio_frame(SrsRtpPacket2* pkt); srs_error_t on_video(SrsRtpPacket2* pkt); - srs_error_t collect_video_frames(); - srs_error_t do_collect_video_frame(std::vector& packets); + srs_error_t collect_video_frame(SrsRtpPacket2* pkt); public: void request_keyframe(); // interface ISrsHourGlass diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 511ff90a1..7f7070c7f 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -450,9 +450,53 @@ SrsRtpVideoQueue::~SrsRtpVideoQueue() { } -void SrsRtpVideoQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames) +srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) { - collect_packet(frames, nack); + srs_error_t err = srs_success; + + uint8_t v = (uint8_t)pkt->nalu_type; + if (v == kFuA) { + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + if (!payload) { + srs_freep(pkt); + return srs_error_new(ERROR_RTC_RTP_MUXER, "FU-A payload"); + } + + pkt->video_is_first_packet = payload->start; + pkt->video_is_last_packet = payload->end; + pkt->video_is_idr = (payload->nalu_type == SrsAvcNaluTypeIDR); + } else { + pkt->video_is_first_packet = true; + pkt->video_is_last_packet = true; + + if (v == kStapA) { + pkt->video_is_idr = true; + } else { + pkt->video_is_idr = (pkt->nalu_type == SrsAvcNaluTypeIDR); + } + } + + if ((err = SrsRtpQueue::consume(nack, pkt)) != srs_success) { + return srs_error_wrap(err, "video consume"); + } + + return err; +} + +void SrsRtpVideoQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector& frames) +{ + while (queue_->low() != queue_->high()) { + SrsRtpPacket2* pkt = NULL; + + collect_packet(nack, &pkt); + + if (!pkt) { + return; + } + + nn_collected_frames++; + frames.push_back(pkt); + } if (queue_->overflow()) { on_overflow(nack); @@ -493,41 +537,27 @@ void SrsRtpVideoQueue::on_overflow(SrsRtpNackForReceiver* nack) queue_->advance_to(next + 1); } -void SrsRtpVideoQueue::collect_packet(vector >& frames, SrsRtpNackForReceiver* nack) -{ - while (queue_->low() != queue_->high()) { - vector frame; - - do_collect_packet(nack, frame); - - if (frame.empty()) { - return; - } - - nn_collected_frames++; - frames.push_back(frame); - } -} - // TODO: FIXME: Should refer to the FU-A original video frame, to avoid finding for each packet. -void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vector& frame) +void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt) { // When done, s point to the next available packet. uint16_t next = queue_->low(); bool found = false; + vector frame; + for (; next != queue_->high(); ++next) { SrsRtpPacket2* pkt = queue_->at(next); // Not found or in NACK, stop collecting frame. if (!pkt || nack->find(next) != NULL) { srs_trace("wait for nack seq=%u", next); - break; + return; } // Ignore when the first packet not the start. if (next == queue_->low() && !pkt->video_is_first_packet) { - break; + return; } // OK, collect packet to frame. @@ -542,17 +572,78 @@ void SrsRtpVideoQueue::do_collect_packet(SrsRtpNackForReceiver* nack, vectorhigh()) { + if (cur != queue_->high()) { // Reset the range of packets to NULL in buffer. queue_->reset(queue_->low(), next); srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); queue_->advance_to(next); } + + // Merge packets to one packet. + covert_packet(frame, ppkt); + return; +} + +void SrsRtpVideoQueue::covert_packet(std::vector& frame, SrsRtpPacket2** ppkt) +{ + if (frame.size() == 1) { + *ppkt = frame[0]; + return; + } + + // If more than one packet in a frame, it must be FU-A. + SrsRtpPacket2* head = frame.at(0); + SrsAvcNaluType nalu_type = head->nalu_type; + + // Covert FU-A to one RAW RTP packet. + int nn_nalus = 0; + for (size_t i = 0; i < frame.size(); ++i) { + SrsRtpPacket2* pkt = frame[i]; + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + if (!payload) { + nn_nalus = 0; + break; + } + nn_nalus += payload->size; + } + + // Invalid packets, ignore. + if (nalu_type != (SrsAvcNaluType)kFuA || !nn_nalus) { + for (int i = 0; i < (int)frame.size(); i++) { + SrsRtpPacket2* pkt = frame[i]; + srs_freep(pkt); + } + return; + } + + // Merge to one RAW RTP packet. + // TODO: FIXME: Should covert to multiple NALU RTP packet to avoid copying. + SrsRtpPacket2* pkt = new SrsRtpPacket2(); + pkt->rtp_header = head->rtp_header; + + SrsRtpFUAPayload2* head_payload = dynamic_cast(head->payload); + pkt->nalu_type = head_payload->nalu_type; + + SrsRtpRawPayload* payload = pkt->reuse_raw(); + payload->nn_payload = nn_nalus + 1; + payload->payload = new char[payload->nn_payload]; + + SrsBuffer buf(payload->payload, payload->nn_payload); + + buf.write_1bytes(head_payload->nri | head_payload->nalu_type); // NALU header. + + for (size_t i = 0; i < frame.size(); ++i) { + SrsRtpPacket2* pkt = frame[i]; + SrsRtpFUAPayload2* payload = dynamic_cast(pkt->payload); + buf.write_bytes(payload->payload, payload->size); + } + + *ppkt = pkt; } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 445b2c6a7..d5674f429 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -204,13 +204,14 @@ public: SrsRtpVideoQueue(int capacity); virtual ~SrsRtpVideoQueue(); public: - virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector >& frames); + virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); + virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector& frame); bool should_request_key_frame(); void request_keyframe(); private: virtual void on_overflow(SrsRtpNackForReceiver* nack); - virtual void collect_packet(std::vector >& frames, SrsRtpNackForReceiver* nack); - virtual void do_collect_packet(SrsRtpNackForReceiver* nack, std::vector& frame); + virtual void collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt); + virtual void covert_packet(std::vector& frame, SrsRtpPacket2** ppkt); }; #endif From 45f35e3ec8f96362251d1dbe3911bd793f224e99 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 17:43:38 +0800 Subject: [PATCH 52/79] Refactor RTC publisher, rename pkt to frame --- trunk/src/app/srs_app_rtc_conn.cpp | 32 +++++++++++++++--------------- trunk/src/app/srs_app_rtc_conn.hpp | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 2cf983012..35ae6fef1 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1936,22 +1936,22 @@ srs_error_t SrsRtcPublisher::on_audio(SrsRtpPacket2* pkt) audio_queue_->collect_frames(audio_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { - SrsRtpPacket2* pkt = frames[i]; + SrsRtpPacket2* frame = frames[i]; // TODO: FIXME: Check error. - collect_audio_frame(pkt); + on_audio_frame(frame); - srs_freep(pkt); + srs_freep(frame); } return err; } -srs_error_t SrsRtcPublisher::collect_audio_frame(SrsRtpPacket2* pkt) +srs_error_t SrsRtcPublisher::on_audio_frame(SrsRtpPacket2* frame) { srs_error_t err = srs_success; - SrsRtpRawPayload* payload = dynamic_cast(pkt->payload); + SrsRtpRawPayload* payload = dynamic_cast(frame->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "OPUS payload"); @@ -1965,7 +1965,7 @@ srs_error_t SrsRtcPublisher::collect_audio_frame(SrsRtpPacket2* pkt) SrsMessageHeader header; header.message_type = RTMP_MSG_AudioMessage; // TODO: FIXME: Maybe the tbn is not 90k. - header.timestamp = pkt->rtp_header.get_timestamp() / 90; + header.timestamp = frame->rtp_header.get_timestamp() / 90; SrsSharedPtrMessage msg; // TODO: FIXME: Check error. @@ -2000,31 +2000,31 @@ srs_error_t SrsRtcPublisher::on_video(SrsRtpPacket2* pkt) video_queue_->collect_frames(video_nack_, frames); for (size_t i = 0; i < frames.size(); ++i) { - SrsRtpPacket2* pkt = frames[i]; + SrsRtpPacket2* frame = frames[i]; // TODO: FIXME: Check error. - collect_video_frame(pkt); + on_video_frame(frame); - srs_freep(pkt); + srs_freep(frame); } return srs_success; } -srs_error_t SrsRtcPublisher::collect_video_frame(SrsRtpPacket2* pkt) +srs_error_t SrsRtcPublisher::on_video_frame(SrsRtpPacket2* frame) { srs_error_t err = srs_success; - int64_t timestamp = pkt->rtp_header.get_timestamp(); + int64_t timestamp = frame->rtp_header.get_timestamp(); // No FU-A, because we convert it to RAW RTP packet. - if (pkt->nalu_type == (SrsAvcNaluType)kFuA) { + if (frame->nalu_type == (SrsAvcNaluType)kFuA) { return srs_error_new(ERROR_RTC_RTP_MUXER, "invalid FU-A"); } // For STAP-A, it must be SPS/PPS, and only one packet. - if (pkt->nalu_type == (SrsAvcNaluType)kStapA) { - SrsRtpSTAPPayload* payload = dynamic_cast(pkt->payload); + if (frame->nalu_type == (SrsAvcNaluType)kStapA) { + SrsRtpSTAPPayload* payload = dynamic_cast(frame->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "STAP-A payload"); } @@ -2077,7 +2077,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame(SrsRtpPacket2* pkt) } // For RAW NALU, should be one RAW packet. - SrsRtpRawPayload* payload = dynamic_cast(pkt->payload); + SrsRtpRawPayload* payload = dynamic_cast(frame->payload); if (!payload) { return srs_error_new(ERROR_RTC_RTP_MUXER, "RAW-NALU payload"); } @@ -2092,7 +2092,7 @@ srs_error_t SrsRtcPublisher::collect_video_frame(SrsRtpPacket2* pkt) char* data = new char[nn_payload]; SrsBuffer buf(data, nn_payload); - if (pkt->nalu_type == SrsAvcNaluTypeIDR) { + if (frame->nalu_type == SrsAvcNaluTypeIDR) { buf.write_1bytes(0x17); // Keyframe. srs_trace("RTC got IDR %d bytes", nn_payload); } else { diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 2c3474b46..ae83274ac 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -288,9 +288,9 @@ public: virtual void on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffer* buf, ISrsCodec** ppayload); private: srs_error_t on_audio(SrsRtpPacket2* pkt); - srs_error_t collect_audio_frame(SrsRtpPacket2* pkt); + srs_error_t on_audio_frame(SrsRtpPacket2* frame); srs_error_t on_video(SrsRtpPacket2* pkt); - srs_error_t collect_video_frame(SrsRtpPacket2* pkt); + srs_error_t on_video_frame(SrsRtpPacket2* frame); public: void request_keyframe(); // interface ISrsHourGlass From 2dc8e8dca1c2c44d7f68dadccd4a3f2f064f7d56 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 17:57:07 +0800 Subject: [PATCH 53/79] Refactor RTC publish ring buffer --- trunk/src/app/srs_app_rtp_queue.cpp | 134 +++++++++++++++------------- trunk/src/app/srs_app_rtp_queue.hpp | 22 +++-- 2 files changed, 86 insertions(+), 70 deletions(-) diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 7f7070c7f..b0b015128 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -187,38 +187,6 @@ bool SrsRtpRingBuffer::overflow() return high_ - low_ >= capacity_; } -uint16_t SrsRtpRingBuffer::next_start_of_frame() -{ - if (low_ == high_) { - return low_; - } - - for (uint16_t s = low_ + 1 ; s != high_; ++s) { - SrsRtpPacket2*& pkt = queue_[s % capacity_]; - if (pkt && pkt->video_is_first_packet) { - return s; - } - } - - return low_; -} - -uint16_t SrsRtpRingBuffer::next_keyframe() -{ - if (low_ == high_) { - return low_; - } - - for (uint16_t s = low_ + 1 ; s != high_; ++s) { - SrsRtpPacket2*& pkt = queue_[s % capacity_]; - if (pkt && pkt->video_is_idr && pkt->video_is_first_packet) { - return s; - } - } - - return low_; -} - uint32_t SrsRtpRingBuffer::get_extended_highest_sequence() { return nn_seq_flip_backs * 65536 + high_; @@ -333,34 +301,6 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt return err; } -void SrsRtpQueue::notify_drop_seq(uint16_t seq) -{ - uint16_t next = queue_->next_start_of_frame(); - - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - - // When NACK is timeout, move to the next start of frame. - srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); - queue_->advance_to(next + 1); -} - -void SrsRtpQueue::notify_nack_list_full() -{ - uint16_t next = queue_->next_keyframe(); - - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - - // When NACK is overflow, move to the next keyframe. - srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); - queue_->advance_to(next + 1); -} - uint32_t SrsRtpQueue::get_extended_highest_sequence() { return queue_->get_extended_highest_sequence(); @@ -408,6 +348,18 @@ SrsRtpAudioQueue::~SrsRtpAudioQueue() { } +void SrsRtpAudioQueue::notify_drop_seq(uint16_t seq) +{ + // TODO: FIXME: The seq may be greater than high. + queue_->advance_to(seq + 1); +} + +void SrsRtpAudioQueue::notify_nack_list_full() +{ + // TODO: FIXME: Maybe we should not drop all packets. + queue_->advance_to(queue_->high()); +} + void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, vector& frames) { // When done, s point to the next available packet. @@ -450,6 +402,34 @@ SrsRtpVideoQueue::~SrsRtpVideoQueue() { } +void SrsRtpVideoQueue::notify_drop_seq(uint16_t seq) +{ + uint16_t next = next_start_of_frame(); + + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; + } + + // When NACK is timeout, move to the next start of frame. + srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); + queue_->advance_to(next + 1); +} + +void SrsRtpVideoQueue::notify_nack_list_full() +{ + uint16_t next = next_keyframe(); + + // Note that low_ mean not found, clear queue util one packet. + if (next == queue_->low()) { + next = queue_->high() - 1; + } + + // When NACK is overflow, move to the next keyframe. + srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); + queue_->advance_to(next + 1); +} + srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) { srs_error_t err = srs_success; @@ -520,7 +500,7 @@ void SrsRtpVideoQueue::request_keyframe() void SrsRtpVideoQueue::on_overflow(SrsRtpNackForReceiver* nack) { - uint16_t next = queue_->next_start_of_frame(); + uint16_t next = next_start_of_frame(); // Note that low_ mean not found, clear queue util one packet. if (next == queue_->low()) { @@ -647,3 +627,35 @@ void SrsRtpVideoQueue::covert_packet(std::vector& frame, SrsRtpP *ppkt = pkt; } +uint16_t SrsRtpVideoQueue::next_start_of_frame() +{ + if (queue_->low() == queue_->high()) { + return queue_->low(); + } + + for (uint16_t s = queue_->low() + 1 ; s != queue_->high(); ++s) { + SrsRtpPacket2* pkt = queue_->at(s); + if (pkt && pkt->video_is_first_packet) { + return s; + } + } + + return queue_->low(); +} + +uint16_t SrsRtpVideoQueue::next_keyframe() +{ + if (queue_->low() == queue_->high()) { + return queue_->low(); + } + + for (uint16_t s = queue_->low() + 1 ; s != queue_->high(); ++s) { + SrsRtpPacket2* pkt = queue_->at(s); + if (pkt && pkt->video_is_idr && pkt->video_is_first_packet) { + return s; + } + } + + return queue_->low(); +} + diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index d5674f429..7ef0485e1 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -143,13 +143,6 @@ public: void reset(uint16_t low, uint16_t high); // Whether queue overflow or heavy(too many packets and need clear). bool overflow(); - // For video, get the next start packet of frame. - // @remark If not found, return the low_, which should never be the "next" one, - // because it MAY or NOT current start packet of frame but never be the next. - uint16_t next_start_of_frame(); - // For video, get the next seq of keyframe. - // @remark Return low_ if not found. - uint16_t next_keyframe(); // The highest sequence number, calculate the flip back base. uint32_t get_extended_highest_sequence(); // Update the sequence, got the nack range by [low, high]. @@ -176,8 +169,8 @@ public: virtual ~SrsRtpQueue(); public: virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); - void notify_drop_seq(uint16_t seq); - void notify_nack_list_full(); + virtual void notify_drop_seq(uint16_t seq) = 0; + virtual void notify_nack_list_full() = 0; public: uint32_t get_extended_highest_sequence(); uint8_t get_fraction_lost(); @@ -193,6 +186,8 @@ public: SrsRtpAudioQueue(int capacity); virtual ~SrsRtpAudioQueue(); public: + virtual void notify_drop_seq(uint16_t seq); + virtual void notify_nack_list_full(); virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector& frames); }; @@ -204,6 +199,8 @@ public: SrsRtpVideoQueue(int capacity); virtual ~SrsRtpVideoQueue(); public: + virtual void notify_drop_seq(uint16_t seq); + virtual void notify_nack_list_full(); virtual srs_error_t consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt); virtual void collect_frames(SrsRtpNackForReceiver* nack, std::vector& frame); bool should_request_key_frame(); @@ -212,6 +209,13 @@ private: virtual void on_overflow(SrsRtpNackForReceiver* nack); virtual void collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt); virtual void covert_packet(std::vector& frame, SrsRtpPacket2** ppkt); + // For video, get the next start packet of frame. + // @remark If not found, return the low_, which should never be the "next" one, + // because it MAY or NOT current start packet of frame but never be the next. + uint16_t next_start_of_frame(); + // For video, get the next seq of keyframe. + // @remark Return low_ if not found. + uint16_t next_keyframe(); }; #endif From 128fc9d8c7bd8f84e270a0d8669075d9ac49458e Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 18:07:09 +0800 Subject: [PATCH 54/79] Refactor publisher ring buffer, allow startup drop frame --- trunk/src/app/srs_app_rtp_queue.cpp | 17 +++++------------ trunk/src/app/srs_app_rtp_queue.hpp | 3 +-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index b0b015128..618065c1a 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -192,7 +192,7 @@ uint32_t SrsRtpRingBuffer::get_extended_highest_sequence() return nn_seq_flip_backs * 65536 + high_; } -void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, uint16_t& nack_high) +void SrsRtpRingBuffer::update(uint16_t seq, uint16_t& nack_low, uint16_t& nack_high) { if (!initialized_) { initialized_ = true; @@ -219,11 +219,8 @@ void SrsRtpRingBuffer::update(uint16_t seq, bool startup, uint16_t& nack_low, ui // When startup, we may receive packets in chaos order. // Because we don't know the ISN(initiazlie sequence number), the first packet // we received maybe no the first packet client sent. - if (startup) { - nack_low = seq + 1; - nack_high = low_; - low_ = seq; - } + // @remark We only log a warning, because it seems ok for publisher. + srs_warn("too old seq %u, range [%u, %u]", seq, low_, high_); } } @@ -234,7 +231,6 @@ SrsRtpPacket2* SrsRtpRingBuffer::at(uint16_t seq) SrsRtpQueue::SrsRtpQueue(int capacity) { - nn_collected_frames = 0; queue_ = new SrsRtpRingBuffer(capacity); jitter_ = 0; @@ -288,9 +284,9 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt if (!nack_info) { ++num_of_packet_received_; uint16_t nack_low = 0, nack_high = 0; - queue_->update(seq, !nn_collected_frames, nack_low, nack_high); + queue_->update(seq, nack_low, nack_high); if (srs_rtp_seq_distance(nack_low, nack_high)) { - srs_trace("update nack seq=%u, startup=%d, range [%u, %u]", seq, !nn_collected_frames, nack_low, nack_high); + srs_trace("update seq=%u, nack range [%u, %u]", seq, nack_low, nack_high); insert_into_nack_list(nack, nack_low, nack_high); } } @@ -374,8 +370,6 @@ void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, vector Date: Sun, 3 May 2020 19:09:48 +0800 Subject: [PATCH 55/79] Refine RTC publisher, no cache. 4.0.25 --- trunk/src/app/srs_app_rtp_queue.cpp | 168 +++++++++++++-------------- trunk/src/app/srs_app_rtp_queue.hpp | 46 ++++---- trunk/src/core/srs_core_version4.hpp | 2 +- 3 files changed, 103 insertions(+), 113 deletions(-) diff --git a/trunk/src/app/srs_app_rtp_queue.cpp b/trunk/src/app/srs_app_rtp_queue.cpp index 618065c1a..3702e775f 100644 --- a/trunk/src/app/srs_app_rtp_queue.cpp +++ b/trunk/src/app/srs_app_rtp_queue.cpp @@ -131,7 +131,7 @@ void SrsRtpNackForReceiver::update_rtt(int rtt) SrsRtpRingBuffer::SrsRtpRingBuffer(int capacity) { nn_seq_flip_backs = 0; - high_ = low_ = 0; + begin = end = 0; capacity_ = (uint16_t)capacity; initialized_ = false; @@ -144,19 +144,21 @@ SrsRtpRingBuffer::~SrsRtpRingBuffer() srs_freepa(queue_); } -uint16_t SrsRtpRingBuffer::low() +bool SrsRtpRingBuffer::empty() { - return low_; + return begin == end; } -uint16_t SrsRtpRingBuffer::high() +int SrsRtpRingBuffer::size() { - return high_; + int size = srs_rtp_seq_distance(begin, end); + srs_assert(size >= 0); + return size; } void SrsRtpRingBuffer::advance_to(uint16_t seq) { - low_ = seq; + begin = seq; } void SrsRtpRingBuffer::set(uint16_t at, SrsRtpPacket2* pkt) @@ -175,52 +177,54 @@ void SrsRtpRingBuffer::remove(uint16_t at) set(at, NULL); } -void SrsRtpRingBuffer::reset(uint16_t low, uint16_t high) +void SrsRtpRingBuffer::reset(uint16_t first, uint16_t last) { - for (uint16_t s = low; s != high; ++s) { + for (uint16_t s = first; s != last; ++s) { queue_[s % capacity_] = NULL; } } bool SrsRtpRingBuffer::overflow() { - return high_ - low_ >= capacity_; + return srs_rtp_seq_distance(begin, end) >= capacity_; } uint32_t SrsRtpRingBuffer::get_extended_highest_sequence() { - return nn_seq_flip_backs * 65536 + high_; + return nn_seq_flip_backs * 65536 + end - 1; } -void SrsRtpRingBuffer::update(uint16_t seq, uint16_t& nack_low, uint16_t& nack_high) +void SrsRtpRingBuffer::update(uint16_t seq, uint16_t& nack_first, uint16_t& nack_last) { if (!initialized_) { initialized_ = true; - low_ = high_ = seq; + begin = seq; + end = seq + 1; return; } // Normal sequence, seq follows high_. - if (srs_rtp_seq_distance(high_, seq)) { - nack_low = high_ + 1; - nack_high = seq; + if (srs_rtp_seq_distance(end, seq) >= 0) { + nack_first = end + 1; + nack_last = seq + 1; // When distance(seq,high_)>0 and seq0 and 1<65535. - if (seq < high_) { + // TODO: FIXME: The first flip may be dropped. + if (seq < end) { ++nn_seq_flip_backs; } - high_ = seq; + end = seq + 1; return; } // Out-of-order sequence, seq before low_. - if (srs_rtp_seq_distance(seq, low_)) { + if (srs_rtp_seq_distance(seq, begin) > 0) { // When startup, we may receive packets in chaos order. // Because we don't know the ISN(initiazlie sequence number), the first packet // we received maybe no the first packet client sent. // @remark We only log a warning, because it seems ok for publisher. - srs_warn("too old seq %u, range [%u, %u]", seq, low_, high_); + srs_warn("too old seq %u, range [%u, %u]", seq, begin, end); } } @@ -283,11 +287,11 @@ srs_error_t SrsRtpQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt // OK, we got one new RTP packet, which is not in NACK. if (!nack_info) { ++num_of_packet_received_; - uint16_t nack_low = 0, nack_high = 0; - queue_->update(seq, nack_low, nack_high); - if (srs_rtp_seq_distance(nack_low, nack_high)) { - srs_trace("update seq=%u, nack range [%u, %u]", seq, nack_low, nack_high); - insert_into_nack_list(nack, nack_low, nack_high); + uint16_t nack_first = 0, nack_last = 0; + queue_->update(seq, nack_first, nack_last); + if (srs_rtp_seq_distance(nack_first, nack_last) > 0) { + srs_trace("update seq=%u, nack range [%u, %u]", seq, nack_first, nack_last); + insert_into_nack_list(nack, nack_first, nack_last); } } @@ -326,9 +330,9 @@ uint32_t SrsRtpQueue::get_interarrival_jitter() return static_cast(jitter_); } -void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end) +void SrsRtpQueue::insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t first, uint16_t last) { - for (uint16_t s = seq_start; s != seq_end; ++s) { + for (uint16_t s = first; s != last; ++s) { nack->insert(s); ++number_of_packet_lossed_; } @@ -346,22 +350,26 @@ SrsRtpAudioQueue::~SrsRtpAudioQueue() void SrsRtpAudioQueue::notify_drop_seq(uint16_t seq) { - // TODO: FIXME: The seq may be greater than high. - queue_->advance_to(seq + 1); + uint16_t next = seq + 1; + if (srs_rtp_seq_distance(queue_->end, seq) > 0) { + seq = queue_->end; + } + srs_trace("nack drop seq=%u, drop range [%u, %u, %u]", seq, queue_->begin, next, queue_->end); + + queue_->advance_to(next); } void SrsRtpAudioQueue::notify_nack_list_full() { // TODO: FIXME: Maybe we should not drop all packets. - queue_->advance_to(queue_->high()); + queue_->advance_to(queue_->end); } void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, vector& frames) { - // When done, s point to the next available packet. - uint16_t next = queue_->low(); - - for (; next != queue_->high(); ++next) { + // When done, next point to the next available packet. + uint16_t next = queue_->begin; + for (; next != queue_->end; ++next) { SrsRtpPacket2* pkt = queue_->at(next); // Not found or in NACK, stop collecting frame. @@ -373,17 +381,17 @@ void SrsRtpAudioQueue::collect_frames(SrsRtpNackForReceiver* nack, vectorlow() != next) { + if (next != queue_->begin) { // Reset the range of packets to NULL in buffer. - queue_->reset(queue_->low(), next); + queue_->reset(queue_->begin, next); - srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); + srs_verbose("RTC collect audio [%u, %u, %u]", queue_->begin, next, queue_->end); queue_->advance_to(next); } // For audio, if overflow, clear all packets. if (queue_->overflow()) { - queue_->advance_to(queue_->high()); + queue_->advance_to(queue_->end); } } @@ -398,30 +406,20 @@ SrsRtpVideoQueue::~SrsRtpVideoQueue() void SrsRtpVideoQueue::notify_drop_seq(uint16_t seq) { - uint16_t next = next_start_of_frame(); + // If not found start frame, return the end, and we will clear queue. + uint16_t next = next_start_of_frame(seq); + srs_trace("nack drop seq=%u, drop range [%u, %u, %u]", seq, queue_->begin, next, queue_->end); - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - - // When NACK is timeout, move to the next start of frame. - srs_trace("nack drop seq=%u, drop range [%u, %u]", seq, queue_->low(), next + 1); - queue_->advance_to(next + 1); + queue_->advance_to(next); } void SrsRtpVideoQueue::notify_nack_list_full() { + // If not found start frame, return the end, and we will clear queue. uint16_t next = next_keyframe(); + srs_trace("nack overflow, drop range [%u, %u, %u]", queue_->begin, next, queue_->end); - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - - // When NACK is overflow, move to the next keyframe. - srs_trace("nack overflow drop range [%u, %u]", queue_->low(), next + 1); - queue_->advance_to(next + 1); + queue_->advance_to(next); } srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2* pkt) @@ -459,13 +457,13 @@ srs_error_t SrsRtpVideoQueue::consume(SrsRtpNackForReceiver* nack, SrsRtpPacket2 void SrsRtpVideoQueue::collect_frames(SrsRtpNackForReceiver* nack, std::vector& frames) { - while (queue_->low() != queue_->high()) { + while (true) { SrsRtpPacket2* pkt = NULL; - collect_packet(nack, &pkt); + collect_frame(nack, &pkt); if (!pkt) { - return; + break; } frames.push_back(pkt); @@ -493,33 +491,27 @@ void SrsRtpVideoQueue::request_keyframe() void SrsRtpVideoQueue::on_overflow(SrsRtpNackForReceiver* nack) { - uint16_t next = next_start_of_frame(); + // If not found start frame, return the end, and we will clear queue. + uint16_t next = next_start_of_frame(queue_->begin); + srs_trace("on overflow, remove range [%u, %u, %u]", queue_->begin, next, queue_->end); - // Note that low_ mean not found, clear queue util one packet. - if (next == queue_->low()) { - next = queue_->high() - 1; - } - srs_trace("seq out of range [%u, %u]", queue_->low(), next); - - for (uint16_t s = queue_->low(); s != next; ++s) { + for (uint16_t s = queue_->begin; s != next; ++s) { nack->remove(s); queue_->remove(s); } - srs_trace("force update seq %u to %u", queue_->low(), next + 1); - queue_->advance_to(next + 1); + queue_->advance_to(next); } // TODO: FIXME: Should refer to the FU-A original video frame, to avoid finding for each packet. -void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt) +void SrsRtpVideoQueue::collect_frame(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt) { - // When done, s point to the next available packet. - uint16_t next = queue_->low(); - bool found = false; vector frame; - for (; next != queue_->high(); ++next) { + // When done, next point to the next available packet. + uint16_t next = queue_->begin; + for (; next != queue_->end; ++next) { SrsRtpPacket2* pkt = queue_->at(next); // Not found or in NACK, stop collecting frame. @@ -529,7 +521,7 @@ void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2 } // Ignore when the first packet not the start. - if (next == queue_->low() && !pkt->video_is_first_packet) { + if (next == queue_->begin && !pkt->video_is_first_packet) { return; } @@ -549,21 +541,20 @@ void SrsRtpVideoQueue::collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2 return; } - uint16_t cur = next - 1; - if (cur != queue_->high()) { + if (next != queue_->begin) { // Reset the range of packets to NULL in buffer. - queue_->reset(queue_->low(), next); + queue_->reset(queue_->begin, next); - srs_verbose("collect on frame, update head seq=%u t %u", queue_->low(), next); + srs_verbose("RTC collect video [%u, %u, %u]", queue_->begin, next, queue_->end); queue_->advance_to(next); } // Merge packets to one packet. - covert_packet(frame, ppkt); + covert_frame(frame, ppkt); return; } -void SrsRtpVideoQueue::covert_packet(std::vector& frame, SrsRtpPacket2** ppkt) +void SrsRtpVideoQueue::covert_frame(std::vector& frame, SrsRtpPacket2** ppkt) { if (frame.size() == 1) { *ppkt = frame[0]; @@ -620,35 +611,34 @@ void SrsRtpVideoQueue::covert_packet(std::vector& frame, SrsRtpP *ppkt = pkt; } -uint16_t SrsRtpVideoQueue::next_start_of_frame() +uint16_t SrsRtpVideoQueue::next_start_of_frame(uint16_t seq) { - if (queue_->low() == queue_->high()) { - return queue_->low(); + uint16_t s = seq; + if (srs_rtp_seq_distance(seq, queue_->begin) >= 0) { + s = queue_->begin + 1; } - for (uint16_t s = queue_->low() + 1 ; s != queue_->high(); ++s) { + for (; s != queue_->end; ++s) { SrsRtpPacket2* pkt = queue_->at(s); if (pkt && pkt->video_is_first_packet) { return s; } } - return queue_->low(); + return queue_->end; } uint16_t SrsRtpVideoQueue::next_keyframe() { - if (queue_->low() == queue_->high()) { - return queue_->low(); - } + uint16_t s = queue_->begin + 1; - for (uint16_t s = queue_->low() + 1 ; s != queue_->high(); ++s) { + for (; s != queue_->end; ++s) { SrsRtpPacket2* pkt = queue_->at(s); if (pkt && pkt->video_is_idr && pkt->video_is_first_packet) { return s; } } - return queue_->low(); + return queue_->end; } diff --git a/trunk/src/app/srs_app_rtp_queue.hpp b/trunk/src/app/srs_app_rtp_queue.hpp index 60ee7a162..7b3d496e9 100644 --- a/trunk/src/app/srs_app_rtp_queue.hpp +++ b/trunk/src/app/srs_app_rtp_queue.hpp @@ -66,9 +66,9 @@ struct SrsRtpNackInfo // distance(low=3, high=65534) === (int16_t)(uint16_t)((uint16_t)3-(uint16_t)65534) === 5 // distance(low=65532, high=65534) === (int16_t)(uint16_t)((uint16_t)65532-(uint16_t)65534) === -2 // For RTP sequence, it's only uint16 and may flip back, so 3 maybe 3+0xffff. -inline bool srs_rtp_seq_distance(const uint16_t& low, const uint16_t& high) +inline int16_t srs_rtp_seq_distance(const uint16_t& low, const uint16_t& high) { - return ((int16_t)(high - low)) > 0; + return (int16_t)(high - low); } class SrsRtpNackForReceiver @@ -76,7 +76,7 @@ class SrsRtpNackForReceiver private: struct SeqComp { bool operator()(const uint16_t& low, const uint16_t& high) const { - return srs_rtp_seq_distance(low, high); + return srs_rtp_seq_distance(low, high) > 0; } }; private: @@ -124,29 +124,34 @@ private: uint64_t nn_seq_flip_backs; // Whether initialized, because we use uint16 so we can't use -1. bool initialized_; -private: - // Current position we are working at. - uint16_t low_; - uint16_t high_; +public: + // The begin iterator for ring buffer. + // For example, when got 1 elems, the begin is 0. + uint16_t begin; + // The end iterator for ring buffer. + // For example, when got 1 elems, the end is 1. + uint16_t end; public: SrsRtpRingBuffer(int capacity); virtual ~SrsRtpRingBuffer(); public: - // Move the position of buffer. - uint16_t low(); - uint16_t high(); + // Whether the ring buffer is empty. + bool empty(); + // Get the count of elems in ring buffer. + int size(); + // Move the low position of buffer to seq. void advance_to(uint16_t seq); // Free the packet at position. void set(uint16_t at, SrsRtpPacket2* pkt); void remove(uint16_t at); - // Directly reset range [low, high] to NULL. - void reset(uint16_t low, uint16_t high); + // Directly reset range [first, last) to NULL. + void reset(uint16_t first, uint16_t last); // Whether queue overflow or heavy(too many packets and need clear). bool overflow(); // The highest sequence number, calculate the flip back base. uint32_t get_extended_highest_sequence(); - // Update the sequence, got the nack range by [low, high]. - void update(uint16_t seq, uint16_t& nack_low, uint16_t& nack_high); + // Update the sequence, got the nack range by [first, last). + void update(uint16_t seq, uint16_t& nack_first, uint16_t& nack_last); // Get the packet by seq. SrsRtpPacket2* at(uint16_t seq); }; @@ -176,7 +181,7 @@ public: uint32_t get_cumulative_number_of_packets_lost(); uint32_t get_interarrival_jitter(); private: - void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t seq_start, uint16_t seq_end); + void insert_into_nack_list(SrsRtpNackForReceiver* nack, uint16_t first, uint16_t last); }; class SrsRtpAudioQueue : public SrsRtpQueue @@ -206,14 +211,9 @@ public: void request_keyframe(); private: virtual void on_overflow(SrsRtpNackForReceiver* nack); - virtual void collect_packet(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt); - virtual void covert_packet(std::vector& frame, SrsRtpPacket2** ppkt); - // For video, get the next start packet of frame. - // @remark If not found, return the low_, which should never be the "next" one, - // because it MAY or NOT current start packet of frame but never be the next. - uint16_t next_start_of_frame(); - // For video, get the next seq of keyframe. - // @remark Return low_ if not found. + virtual void collect_frame(SrsRtpNackForReceiver* nack, SrsRtpPacket2** ppkt); + virtual void covert_frame(std::vector& frame, SrsRtpPacket2** ppkt); + uint16_t next_start_of_frame(uint16_t seq); uint16_t next_keyframe(); }; diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index abaee8484..a5eb4d404 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -24,6 +24,6 @@ #ifndef SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP -#define SRS_VERSION4_REVISION 24 +#define SRS_VERSION4_REVISION 25 #endif From 47df22df9e9b9d5e21c4ad47d6aec69c63c17276 Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 3 May 2020 20:19:45 +0800 Subject: [PATCH 56/79] Refine RTC, no trickle for ice-lite, disable algorithms right-now --- trunk/research/players/rtc_player.html | 2 +- trunk/research/players/rtc_publisher.html | 8 ++-- trunk/src/app/srs_app_http_api.cpp | 37 +++++++++++++---- trunk/src/app/srs_app_sdp.cpp | 48 ++++++++++++----------- 4 files changed, 60 insertions(+), 35 deletions(-) diff --git a/trunk/research/players/rtc_player.html b/trunk/research/players/rtc_player.html index 03d23bd13..28416fd4b 100644 --- a/trunk/research/players/rtc_player.html +++ b/trunk/research/players/rtc_player.html @@ -46,7 +46,7 @@
- +

diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index bb33c9dec..7945c7044 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -46,7 +46,7 @@
- +