add mutex for REMB access control and change remb_startup type to int

Author: hyt-hz

trunk/src/app/srs_app_rtc_conn.cpp

@@ -1126,6 +1126,7 @@ SrsRtcPublishStream::SrsRtcPublishStream(SrsRtcConnection* session, const SrsCon
 
     bitrate_ = 0;
     remb_startup_ = 4;
+    lock_remb_ = srs_mutex_new();
 
     timer_rtcp_ = new SrsRtcPublishRtcpTimer(this);
     timer_twcc_ = new SrsRtcPublishTwccTimer(this);
@@ -1137,6 +1138,7 @@ SrsRtcPublishStream::~SrsRtcPublishStream()
         session_->server_->exec_async_work(new SrsRtcAsyncCallOnUnpublish(cid_, req_));
     }
 
+    srs_mutex_destroy(lock_remb_);
     srs_freep(timer_rtcp_);
     srs_freep(timer_twcc_);
 
@@ -1374,6 +1376,10 @@ srs_error_t SrsRtcPublishStream::send_rtcp_rr()
 srs_error_t SrsRtcPublishStream::send_rtcp_remb()
 {
     srs_error_t err = srs_success;
+    
+    // Serialize access from both timer and per-packet paths.
+    SrsLocker(lock_remb_);
+    
     uint32_t bitrate = bitrate_;
 
     // no bitrate control
@@ -1403,7 +1409,6 @@ srs_error_t SrsRtcPublishStream::send_rtcp_remb()
         return srs_error_wrap(err, "rtcp remb send error(ssrc=%u, bitrate=%llu)" , ssrc, (unsigned long long)bitrate);
     }
 
-
     return err;
 }
 

trunk/src/app/srs_app_rtc_conn.hpp

@@ -342,7 +342,8 @@ class SrsRtcPublishStream : public ISrsRtspPacketDecodeHandler
     bool nack_no_copy_;
     bool twcc_enabled_;
     uint64_t bitrate_;
-    uint64_t remb_startup_;
+    int remb_startup_;
+    srs_mutex_t lock_remb_;
 private:
     bool request_keyframe_;
     SrsErrorPithyPrint* pli_epp;