external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Refactor RTC session API

Browse source
This commit is contained in:
winlin 2020-05-03 09:55:43 +08:00
parent 5fb7c4efbc
commit 157bc713a9
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -2247,17 +2247,16 @@ srs_error_t SrsRtcPublisher::notify(int type, srs_utime_t interval, srs_utime_t
return err; 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 = NULL;
req = r->copy(); cid = 0;
cid = context_id; is_publisher_ = false;
encrypt = true; encrypt = true;
source_ = source; source_ = NULL;
publisher = NULL; publisher = NULL;
sender = NULL; sender = NULL;
is_publisher_ = is_publisher;
sendonly_skt = NULL; sendonly_skt = NULL;
rtc_server = s; rtc_server = s;
dtls_session = new SrsDtlsSession(this); dtls_session = new SrsDtlsSession(this);
@ -2343,10 +2342,16 @@ int SrsRtcSession::context_id()
return cid; 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; 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) { if ((err = dtls_session->initialize(req)) != srs_success) {
return srs_error_wrap(err, "init"); 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 padding = first & 0x20;
uint8_t fmt = first & 0x1F; uint8_t fmt = first & 0x1F;
// TODO: FIXME: Dead code?
/*uint8_t payload_type = */stream->read_1bytes(); /*uint8_t payload_type = */stream->read_1bytes();
/*uint16_t length = */stream->read_2bytes(); /*uint16_t length = */stream->read_2bytes();
/*uint32_t ssrc_of_sender = */stream->read_4bytes(); /*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(); SrsRtcPublisher* publisher = source_->rtc_publisher();
if (publisher) { if (publisher) {
publisher->request_keyframe(); publisher->request_keyframe();
srs_trace("RTC request PLI");
} }
srs_trace("RTC request PLI");
break; break;
} }
case kSLI: { case kSLI: {
@ -3371,8 +3375,8 @@ srs_error_t SrsRtcServer::create_rtc_session(
} }
int cid = _srs_context->get_id(); int cid = _srs_context->get_id();
SrsRtcSession* session = new SrsRtcSession(this, source, req, publish, username, cid); SrsRtcSession* session = new SrsRtcSession(this);
if ((err = session->initialize()) != srs_success) { if ((err = session->initialize(source, req, publish, username, cid)) != srs_success) {
srs_freep(session); srs_freep(session);
return srs_error_wrap(err, "init"); return srs_error_wrap(err, "init");
} }

4
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -337,7 +337,7 @@ private:
sockaddr_in* blackhole_addr; sockaddr_in* blackhole_addr;
srs_netfd_t blackhole_stfd; srs_netfd_t blackhole_stfd;
public: public:
SrsRtcSession(SrsRtcServer* s, SrsSource* source, SrsRequest* r, bool is_publisher, const std::string& un, int context_id); SrsRtcSession(SrsRtcServer* s);
virtual ~SrsRtcSession(); virtual ~SrsRtcSession();
public: public:
SrsSdp* get_local_sdp(); SrsSdp* get_local_sdp();
@ -353,7 +353,7 @@ public:
void switch_to_context(); void switch_to_context();
int context_id(); int context_id();
public: 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. // 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_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r);
srs_error_t on_dtls(char* data, int nb_data); srs_error_t on_dtls(char* data, int nb_data);