Plumb through clear-ssrc signal to rtp session, remove the corresponding rtp source

Author: Dari-K

subprojects/gst-plugins-good/gst/rtpmanager/gstrtpbin.c

@@ -1246,6 +1246,10 @@ gst_rtp_bin_clear_ssrc (GstRtpBin * bin, guint session_id, guint32 ssrc)
     g_signal_emit_by_name (demux, "clear-ssrc", ssrc, NULL);
     gst_object_unref (demux);
   }
+
+  if (session) {
+    g_signal_emit_by_name (session->session, "clear-ssrc", ssrc, NULL);
+  }
 }
 
 static GstElement *

subprojects/gst-plugins-good/gst/rtpmanager/gstrtpsession.c

@@ -199,6 +199,7 @@ enum
   SIGNAL_REQUEST_PT_MAP,
   SIGNAL_CLEAR_PT_MAP,
   SIGNAL_SEND_BYE,
+  SIGNAL_CLEAR_SSRC,
 
   SIGNAL_ON_NEW_SSRC,
   SIGNAL_ON_SSRC_COLLISION,
@@ -379,6 +380,7 @@ static gboolean gst_rtp_session_setcaps_send_rtp (GstPad * pad,
 
 static void gst_rtp_session_clear_pt_map (GstRtpSession * rtpsession);
 static void gst_rtp_session_send_bye (GstRtpSession * rtpsession);
+static void gst_rtp_session_clear_ssrc (GstRtpSession * rtpsession, guint ssrc);
 
 static GstStructure *gst_rtp_session_create_stats (GstRtpSession * rtpsession);
 
@@ -570,6 +572,19 @@ gst_rtp_session_class_init (GstRtpSessionClass * klass)
       G_STRUCT_OFFSET (GstRtpSessionClass, send_bye),
       NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE);
 
+  /**
+   * GstRtpSession::clear-ssrc:
+   * @sess: the object which received the signal
+   * @ssrc: the ssrc
+   *
+   * Reset the rtpsource associated with the given ssrc.
+   */
+  gst_rtp_session_signals[SIGNAL_CLEAR_SSRC] =
+      g_signal_new ("clear-ssrc", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+      G_STRUCT_OFFSET (GstRtpSessionClass, clear_ssrc),
+      NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_UINT);
+
   /**
    * GstRtpSession::on-new-ssrc:
    * @sess: the object which received the signal
@@ -895,6 +910,7 @@ gst_rtp_session_class_init (GstRtpSessionClass * klass)
 
   klass->clear_pt_map = GST_DEBUG_FUNCPTR (gst_rtp_session_clear_pt_map);
   klass->send_bye = GST_DEBUG_FUNCPTR (gst_rtp_session_send_bye);
+  klass->clear_ssrc = GST_DEBUG_FUNCPTR (gst_rtp_session_clear_ssrc);
 
   /* sink pads */
   gst_element_class_add_static_pad_template (gstelement_class,
@@ -1487,6 +1503,12 @@ gst_rtp_session_send_bye (GstRtpSession * rtpsession)
   rtp_session_schedule_bye (rtpsession->priv->session, current_time);
 }
 
+static void
+gst_rtp_session_clear_ssrc (GstRtpSession * rtpsession, guint ssrc)
+{
+  rtp_session_clear_ssrc (rtpsession->priv->session, ssrc);
+}
+
 /* called when the session manager has an RTP packet ready to be pushed */
 static GstFlowReturn
 gst_rtp_session_process_rtp (RTPSession * sess, RTPSource * src,

subprojects/gst-plugins-good/gst/rtpmanager/gstrtpsession.h

@@ -65,6 +65,7 @@ struct _GstRtpSessionClass {
   GstCaps* (*request_pt_map) (GstRtpSession *sess, guint pt);
   void     (*clear_pt_map)   (GstRtpSession *sess);
   void     (*send_bye)       (GstRtpSession *sess);
+  void     (*clear_ssrc)       (GstRtpSession *sess, guint32 ssrc);
 
   void     (*on_new_ssrc)       (GstRtpSession *sess, guint32 ssrc);
   void     (*on_ssrc_collision) (GstRtpSession *sess, guint32 ssrc);

subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c

@@ -3958,6 +3958,45 @@ rtp_session_mark_all_bye (RTPSession * sess, const gchar * reason)
   RTP_SESSION_UNLOCK (sess);
 }
 
+/**
+ * rtp_session_clear_ssrc:
+ * @sess: an #RTPSession
+ * @ssrc: the ssrc
+ *
+ * Remove the rtp source corresponding to the given ssrc
+ */
+void
+rtp_session_clear_ssrc (RTPSession * sess, guint ssrc)
+{
+  g_return_if_fail (RTP_IS_SESSION (sess));
+  RTPSource *source;
+
+  RTP_SESSION_LOCK (sess);
+  source = find_source (sess, ssrc);
+  if (source) {
+  GST_DEBUG ("Set closing ssrc %u", ssrc);
+    source->closing = TRUE;
+    gboolean is_sender = RTP_SOURCE_IS_SENDER (source);
+    gboolean is_active = RTP_SOURCE_IS_ACTIVE (source);
+
+    sess->total_sources--;
+    if (is_sender) {
+      sess->stats.sender_sources--;
+      if (source->internal)
+        sess->stats.internal_sender_sources--;
+    }
+    if (is_active)
+      sess->stats.active_sources--;
+
+    if (source->internal)
+      sess->stats.internal_sources--;
+
+    /* Now remove the marked sources */
+    g_hash_table_remove (sess->ssrcs[sess->mask_idx], GINT_TO_POINTER(ssrc));
+  }
+  RTP_SESSION_UNLOCK (sess);
+}
+
 /* Stop the current @sess and schedule a BYE message for the other members.
  * One must have the session lock to call this function
  */

subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.h

@@ -464,5 +464,7 @@ gboolean        rtp_session_request_nack           (RTPSession * sess,
 
 void            rtp_session_update_recv_caps_structure (RTPSession * sess, const GstStructure * s);
 
+void            rtp_session_clear_ssrc          (RTPSession *sess, guint ssrc);
+
 
 #endif /* __RTP_SESSION_H__ */