Avoid errors when unregistering sinks

Author: jim-signal

pc/peer_connection.cc

@@ -1843,12 +1843,12 @@ void PeerConnection::Close() {
     RTC_DCHECK_RUN_ON(network_thread());
 
     // RingRTC change to receive RTP data
-    if (rtp_packet_observer_) {
+    if (rtp_demuxer_sink_registered_ && rtp_packet_observer_ != nullptr) {
       JsepTransportController *transport_controller = this->transport_controller_n();
       RtpTransportInternal *rtp_transport = transport_controller->GetBundledRtpTransport();
-      rtp_transport->UnregisterRtpDemuxerSink(rtp_packet_observer_);
-      rtp_packet_observer_ = nullptr;
+      rtp_demuxer_sink_registered_ = !rtp_transport->UnregisterRtpDemuxerSink(rtp_packet_observer_);
     }
+    rtp_packet_observer_ = nullptr;
 
     TeardownDataChannelTransport_n({});
     transport_controller_.reset();
@@ -3144,7 +3144,8 @@ bool PeerConnection::ReceiveRtp(uint8_t pt, bool enable_incoming) {
     if (enable_incoming) {
       rtp_transport->SetIncomingRtpEnabled(true);
     }
-    return rtp_transport->RegisterRtpDemuxerSink(demux_criteria, rtp_packet_observer_);
+    rtp_demuxer_sink_registered_ = rtp_transport->RegisterRtpDemuxerSink(demux_criteria, rtp_packet_observer_);
+    return rtp_demuxer_sink_registered_;
   });
 }
 

pc/peer_connection.h

@@ -766,6 +766,7 @@ class PeerConnection : public PeerConnectionInternal,
   scoped_refptr<IceGathererInterface> shared_ice_gatherer_;
 
   // RingRTC change to receive RTP data
+  bool rtp_demuxer_sink_registered_ = false;
   RtpPacketSinkInterface* rtp_packet_observer_ RTC_GUARDED_BY(network_thread()) = nullptr;
 
   std::unique_ptr<CodecLookupHelper> codec_lookup_helper_;

ringrtc/rffi/src/rtp_observer.cc

@@ -14,11 +14,11 @@ namespace rffi {
 RtpObserverRffi::RtpObserverRffi(void* observer,
                                  const RtpObserverCallbacks* callbacks)
     : observer_(observer), callbacks_(*callbacks) {
-  RTC_LOG(LS_WARNING) << "RtpObserverRffi:ctor(): " << this->observer_;
+  RTC_LOG(LS_INFO) << "RtpObserverRffi:ctor(): " << this->observer_;
 }
 
 RtpObserverRffi::~RtpObserverRffi() {
-  RTC_LOG(LS_WARNING) << "RtpObserverRffi:dtor(): " << this->observer_;
+  RTC_LOG(LS_INFO) << "RtpObserverRffi:dtor(): " << this->observer_;
 }
 
 void RtpObserverRffi::OnRtpPacket(const RtpPacketReceived& rtp_packet) {