mirror of
https://gitlab.gnome.org/GNOME/calls.git
synced 2025-01-08 04:45:31 +00:00
media-pipeline: Put deprecated GStreamer function behind version check macro
gst_element_get_request_pad() is marked as deprecated in GStreamer 1.20.0 in favour of gst_element_request_pad_simple()
This commit is contained in:
parent
8bf2f2cf1d
commit
8c0d135298
1 changed files with 24 additions and 0 deletions
|
@ -575,7 +575,11 @@ initable_init (GInitable *initable,
|
||||||
/* in/receive direction */
|
/* in/receive direction */
|
||||||
/* request and link the pads */
|
/* request and link the pads */
|
||||||
srcpad = gst_element_get_static_pad (self->rtp_src, "src");
|
srcpad = gst_element_get_static_pad (self->rtp_src, "src");
|
||||||
|
#if GST_CHECK_VERSION (1, 20, 0)
|
||||||
|
sinkpad = gst_element_request_pad_simple (self->recv_rtpbin, "recv_rtp_sink_0");
|
||||||
|
#else
|
||||||
sinkpad = gst_element_get_request_pad (self->recv_rtpbin, "recv_rtp_sink_0");
|
sinkpad = gst_element_get_request_pad (self->recv_rtpbin, "recv_rtp_sink_0");
|
||||||
|
#endif
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
"Failed to link rtpsrc to rtpbin");
|
"Failed to link rtpsrc to rtpbin");
|
||||||
|
@ -585,7 +589,11 @@ initable_init (GInitable *initable,
|
||||||
gst_object_unref (sinkpad);
|
gst_object_unref (sinkpad);
|
||||||
|
|
||||||
srcpad = gst_element_get_static_pad (self->rtcp_recv_src, "src");
|
srcpad = gst_element_get_static_pad (self->rtcp_recv_src, "src");
|
||||||
|
#if GST_CHECK_VERSION (1, 20 , 0)
|
||||||
|
sinkpad = gst_element_request_pad_simple (self->recv_rtpbin, "recv_rtcp_sink_0");
|
||||||
|
#else
|
||||||
sinkpad = gst_element_get_request_pad (self->recv_rtpbin, "recv_rtcp_sink_0");
|
sinkpad = gst_element_get_request_pad (self->recv_rtpbin, "recv_rtcp_sink_0");
|
||||||
|
#endif
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
"Failed to link rtcpsrc to rtpbin");
|
"Failed to link rtcpsrc to rtpbin");
|
||||||
|
@ -594,7 +602,11 @@ initable_init (GInitable *initable,
|
||||||
gst_object_unref (srcpad);
|
gst_object_unref (srcpad);
|
||||||
gst_object_unref (sinkpad);
|
gst_object_unref (sinkpad);
|
||||||
|
|
||||||
|
#if GST_CHECK_VERSION (1, 20, 0)
|
||||||
|
srcpad = gst_element_request_pad_simple (self->recv_rtpbin, "send_rtcp_src_0");
|
||||||
|
#else
|
||||||
srcpad = gst_element_get_request_pad (self->recv_rtpbin, "send_rtcp_src_0");
|
srcpad = gst_element_get_request_pad (self->recv_rtpbin, "send_rtcp_src_0");
|
||||||
|
#endif
|
||||||
sinkpad = gst_element_get_static_pad (self->rtcp_recv_sink, "sink");
|
sinkpad = gst_element_get_static_pad (self->rtcp_recv_sink, "sink");
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
|
@ -610,7 +622,11 @@ initable_init (GInitable *initable,
|
||||||
|
|
||||||
/* out/send direction */
|
/* out/send direction */
|
||||||
/* link payloader src to RTP sink pad */
|
/* link payloader src to RTP sink pad */
|
||||||
|
#if GST_CHECK_VERSION (1, 20, 0)
|
||||||
|
sinkpad = gst_element_request_pad_simple (self->send_rtpbin, "send_rtp_sink_0");
|
||||||
|
#else
|
||||||
sinkpad = gst_element_get_request_pad (self->send_rtpbin, "send_rtp_sink_0");
|
sinkpad = gst_element_get_request_pad (self->send_rtpbin, "send_rtp_sink_0");
|
||||||
|
#endif
|
||||||
srcpad = gst_element_get_static_pad (self->payloader, "src");
|
srcpad = gst_element_get_static_pad (self->payloader, "src");
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
|
@ -632,7 +648,11 @@ initable_init (GInitable *initable,
|
||||||
gst_object_unref (sinkpad);
|
gst_object_unref (sinkpad);
|
||||||
|
|
||||||
/* RTCP srcpad to udpsink */
|
/* RTCP srcpad to udpsink */
|
||||||
|
#if GST_CHECK_VERSION (1, 20, 0)
|
||||||
|
srcpad = gst_element_request_pad_simple (self->send_rtpbin, "send_rtcp_src_0");
|
||||||
|
#else
|
||||||
srcpad = gst_element_get_request_pad (self->send_rtpbin, "send_rtcp_src_0");
|
srcpad = gst_element_get_request_pad (self->send_rtpbin, "send_rtcp_src_0");
|
||||||
|
#endif
|
||||||
sinkpad = gst_element_get_static_pad (self->rtcp_send_sink, "sink");
|
sinkpad = gst_element_get_static_pad (self->rtcp_send_sink, "sink");
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
|
@ -644,7 +664,11 @@ initable_init (GInitable *initable,
|
||||||
|
|
||||||
/* receive RTCP */
|
/* receive RTCP */
|
||||||
srcpad = gst_element_get_static_pad (self->rtcp_send_src, "src");
|
srcpad = gst_element_get_static_pad (self->rtcp_send_src, "src");
|
||||||
|
#if GST_CHECK_VERSION (1, 20, 0)
|
||||||
|
sinkpad = gst_element_request_pad_simple (self->send_rtpbin, "recv_rtcp_sink_0");
|
||||||
|
#else
|
||||||
sinkpad = gst_element_get_request_pad (self->send_rtpbin, "recv_rtcp_sink_0");
|
sinkpad = gst_element_get_request_pad (self->send_rtpbin, "recv_rtcp_sink_0");
|
||||||
|
#endif
|
||||||
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
if (gst_pad_link (srcpad, sinkpad) != GST_PAD_LINK_OK) {
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||||
"Failed to link rtcpsrc to rtpbin");
|
"Failed to link rtcpsrc to rtpbin");
|
||||||
|
|
Loading…
Reference in a new issue