From 5f31868ce6e561fd047f882f0a19458c4bef8a09 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 5 Feb 2021 14:07:24 +0800
Subject: [PATCH] RTC: Refine publish stream by find publisher

---
 trunk/src/app/srs_app_rtc_conn.cpp | 20 +++++++++++++++++---
 trunk/src/app/srs_app_rtc_conn.hpp |  4 ++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
index a568ccf43..f5478829e 100644
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -2078,13 +2078,26 @@ srs_error_t SrsRtcConnection::on_rtp(char* data, int nb_data)
 {
     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) {
         return srs_error_new(ERROR_RTC_RTCP, "no publisher");
     }
 
     SrsRtpHeader header;
     if (true) {
-        SrsBuffer* buffer = new SrsBuffer(data, nb_data);
+        SrsBuffer* buffer = new SrsBuffer(buf, size);
         SrsAutoFree(SrsBuffer, buffer);
         header.ignore_padding(true);
         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());
     }
 
-    SrsRtcPublishStream* publisher = it->second;
-    return publisher->on_rtp(data, nb_data);
+    *ppublisher = it->second;
+
+    return err;
 }
 
 srs_error_t SrsRtcConnection::on_connection_established()
diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp
index 3ee7d4e21..509616495 100644
--- a/trunk/src/app/srs_app_rtc_conn.hpp
+++ b/trunk/src/app/srs_app_rtc_conn.hpp
@@ -507,6 +507,10 @@ public:
     srs_error_t on_stun(SrsUdpMuxSocket* skt, SrsStunPacket* r);
     srs_error_t on_dtls(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);
 private:
     srs_error_t dispatch_rtcp(SrsRtcpCommon* rtcp);