rtpbin: fixups after mergertpbin-new

3 files changed, 7 insertions, 43 deletions

diff --git a/gst/rtpmanager/gstrtpsession.c b/gst/rtpmanager/gstrtpsession.c
index 043a8794d..367c0f073 100644
--- a/gst/rtpmanager/gstrtpsession.c
+++ b/gst/rtpmanager/gstrtpsession.c
@@ -946,30 +946,6 @@ gst_rtp_session_clear_pt_map (GstRtpSession * rtpsession)
   g_hash_table_foreach_remove (rtpsession->priv->ptmap, return_true, NULL);
 }
 
-/* called when the session manager has an RTP packet or a list of packets
- * ready for further processing */
-static GstFlowReturn
-gst_rtp_session_process_rtp (RTPSession * sess, RTPSource * src,
-    GstBuffer * buffer, gpointer user_data)
-{
-  GstFlowReturn result;
-  GstRtpSession *rtpsession;
-  GstRtpSessionPrivate *priv;
-
-  rtpsession = GST_RTP_SESSION (user_data);
-  priv = rtpsession->priv;
-
-  if (rtpsession->recv_rtp_src) {
-    GST_LOG_OBJECT (rtpsession, "pushing received RTP packet");
-    result = gst_pad_push (rtpsession->recv_rtp_src, buffer);
-  } else {
-    GST_DEBUG_OBJECT (rtpsession, "dropping received RTP packet");
-    gst_buffer_unref (buffer);
-    result = GST_FLOW_OK;
-  }
-  return result;
-}
-
 /* called when the session manager has an RTP packet ready for further
  * sending */
 static GstFlowReturn
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index 7fc517322..f36f910fc 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -915,24 +915,14 @@ source_push_rtp (RTPSource * source, gpointer data, RTPSession * session)
   GstFlowReturn result = GST_FLOW_OK;
 
   GST_LOG ("source %08x pushed sender RTP packet", source->ssrc);
+  RTP_SESSION_UNLOCK (session);
 
-    if (session->callbacks.send_rtp)
-      result =
-          session->callbacks.send_rtp (session, source, data,
-          session->send_rtp_user_data);
-    else {
-      gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
-    }
-  } else {
-    GST_LOG ("source %08x pushed receiver RTP packet", source->ssrc);
-    RTP_SESSION_UNLOCK (session);
-
-    if (session->callbacks.process_rtp)
-      result =
-          session->callbacks.process_rtp (session, source,
-          GST_BUFFER_CAST (data), session->process_rtp_user_data);
-    else
-      gst_buffer_unref (GST_BUFFER_CAST (data));
+  if (session->callbacks.send_rtp)
+    result =
+        session->callbacks.send_rtp (session, source, data,
+        session->send_rtp_user_data);
+  else {
+    gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
   }
   RTP_SESSION_LOCK (session);
 
diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c
index 1423990c0..6da76bb42 100644
--- a/gst/rtpmanager/rtpsource.c
+++ b/gst/rtpmanager/rtpsource.c
@@ -1835,8 +1835,6 @@ rtp_source_send_rtp (RTPSource * src, gpointer data, gboolean is_list,
   } else {
     buffer = GST_BUFFER_CAST (data);
   }
-  rtp_source_update_caps (src, GST_BUFFER_CAPS (buffer));
-
   len = gst_rtp_buffer_get_payload_len (buffer);
   pt = gst_rtp_buffer_get_payload_type (buffer);