external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Refine publish stream by find publisher

Browse source
This commit is contained in:
winlin 2021-02-05 14:07:24 +08:00
parent f3806126c4
commit cd06f2da0c
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2078,13 +2078,26 @@ srs_error_t SrsRtcConnection::on_rtp(char* data, int nb_data)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
SrsRtcPublishStream* publisher = NULL;
if ((err = find_publisher(data, nb_data, &publisher)) != srs_success) {
return srs_error_wrap(err, "find");
}
srs_assert(publisher);
return publisher->on_rtp(data, nb_data);
}
srs_error_t SrsRtcConnection::find_publisher(char* buf, int size, SrsRtcPublishStream** ppublisher)
{
srs_error_t err = srs_success;
if (publishers_.size() == 0) { if (publishers_.size() == 0) {
return srs_error_new(ERROR_RTC_RTCP, "no publisher"); return srs_error_new(ERROR_RTC_RTCP, "no publisher");
} }
SrsRtpHeader header; SrsRtpHeader header;
if (true) { if (true) {
SrsBuffer* buffer = new SrsBuffer(data, nb_data); SrsBuffer* buffer = new SrsBuffer(buf, size);
SrsAutoFree(SrsBuffer, buffer); SrsAutoFree(SrsBuffer, buffer);
header.ignore_padding(true); header.ignore_padding(true);
if(srs_success != (err = header.decode(buffer))) { if(srs_success != (err = header.decode(buffer))) {
@ -2097,8 +2110,9 @@ srs_error_t SrsRtcConnection::on_rtp(char* data, int nb_data)
return srs_error_new(ERROR_RTC_NO_PUBLISHER, "no publisher for ssrc:%u", header.get_ssrc()); return srs_error_new(ERROR_RTC_NO_PUBLISHER, "no publisher for ssrc:%u", header.get_ssrc());
} }
SrsRtcPublishStream* publisher = it->second; *ppublisher = it->second;
return publisher->on_rtp(data, nb_data);
return err;
} }
srs_error_t SrsRtcConnection::on_connection_established() srs_error_t SrsRtcConnection::on_connection_established()

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

@ -507,6 +507,10 @@ public:
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);
srs_error_t on_rtp(char* data, int nb_data); srs_error_t on_rtp(char* data, int nb_data);
private:
// Decode the RTP header from buf, find the publisher by SSRC.
srs_error_t find_publisher(char* buf, int size, SrsRtcPublishStream** ppublisher);
public:
srs_error_t on_rtcp(char* data, int nb_data); srs_error_t on_rtcp(char* data, int nb_data);
private: private:
srs_error_t dispatch_rtcp(SrsRtcpCommon* rtcp); srs_error_t dispatch_rtcp(SrsRtcpCommon* rtcp);