From d5c072fadd668ee07d5e92b925a1331f79217a9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 3 Oct 2022 19:20:14 +0300 Subject: [PATCH] rtpsource: Rename rtp_source_update_caps to rtp_source_update_send_caps To make it clear that this is only used for sending RTP sources. Part-of: --- subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c | 4 ++-- subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.c | 8 ++++---- subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c index ebd09c5..c9581b0 100644 --- a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c +++ b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c @@ -3214,7 +3214,7 @@ rtp_session_update_send_caps (RTPSession * sess, GstCaps * caps) sess->internal_ssrc_set = TRUE; sess->internal_ssrc_from_caps_or_property = TRUE; if (source) { - rtp_source_update_caps (source, caps); + rtp_source_update_send_caps (source, caps); if (created) on_new_sender_ssrc (sess, source); @@ -3226,7 +3226,7 @@ rtp_session_update_send_caps (RTPSession * sess, GstCaps * caps) source = obtain_internal_source (sess, ssrc, &created, GST_CLOCK_TIME_NONE); if (source) { - rtp_source_update_caps (source, caps); + rtp_source_update_send_caps (source, caps); if (created) on_new_sender_ssrc (sess, source); diff --git a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.c b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.c index 1304e11..cb12644 100644 --- a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.c +++ b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.c @@ -345,7 +345,7 @@ rtp_source_finalize (GObject * object) g_free (src->bye_reason); - gst_caps_replace (&src->caps, NULL); + gst_caps_replace (&src->send_caps, NULL); g_list_free_full (src->conflicting_addresses, (GDestroyNotify) rtp_conflicting_address_free); @@ -820,7 +820,7 @@ rtp_source_get_bye_reason (RTPSource * src) * Parse @caps and store all relevant information in @source. */ void -rtp_source_update_caps (RTPSource * src, GstCaps * caps) +rtp_source_update_send_caps (RTPSource * src, GstCaps * caps) { GstStructure *s; guint val; @@ -828,7 +828,7 @@ rtp_source_update_caps (RTPSource * src, GstCaps * caps) gboolean rtx; /* nothing changed, return */ - if (caps == NULL || src->caps == caps) + if (caps == NULL || src->send_caps == caps) return; s = gst_caps_get_structure (caps, 0); @@ -858,7 +858,7 @@ rtp_source_update_caps (RTPSource * src, GstCaps * caps) GST_DEBUG ("got %sseqnum-offset %" G_GINT32_FORMAT, rtx ? "rtx " : "", src->seqnum_offset); - gst_caps_replace (&src->caps, caps); + gst_caps_replace (&src->send_caps, caps); } /** diff --git a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.h b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.h index 20e65f1..a272305 100644 --- a/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.h +++ b/subprojects/gst-plugins-good/gst/rtpmanager/rtpsource.h @@ -158,7 +158,7 @@ struct _RTPSource { GSocketAddress *rtcp_from; gint payload; - GstCaps *caps; + GstCaps *send_caps; gint clock_rate; gint32 seqnum_offset; @@ -230,7 +230,7 @@ void rtp_source_mark_bye (RTPSource *src, const gchar *rea gboolean rtp_source_is_marked_bye (RTPSource *src); gchar * rtp_source_get_bye_reason (RTPSource *src); -void rtp_source_update_caps (RTPSource *src, GstCaps *caps); +void rtp_source_update_send_caps (RTPSource *src, GstCaps *caps); /* SDES info */ const GstStructure * -- 2.7.4