From 0742a5a2576ff834f6fab1c9cae42e8990aa4467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Sun, 4 May 2014 18:59:33 -0400 Subject: [PATCH] rtpmux: Always let upstream chose the ssrc if it wishes --- gst/rtpmanager/gstrtpmux.c | 7 +------ tests/check/elements/rtpmux.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gst/rtpmanager/gstrtpmux.c b/gst/rtpmanager/gstrtpmux.c index 1fdfad54c5..4cd06ab91a 100644 --- a/gst/rtpmanager/gstrtpmux.c +++ b/gst/rtpmanager/gstrtpmux.c @@ -566,12 +566,7 @@ gst_rtp_mux_setcaps (GstPad * pad, GstRTPMux * rtp_mux, GstCaps * caps) "setting caps %" GST_PTR_FORMAT " on src pad..", caps); ret = gst_pad_set_caps (rtp_mux->srcpad, caps); - if (rtp_mux->ssrc == -1) { - if (gst_structure_has_field_typed (structure, "ssrc", G_TYPE_UINT)) { - rtp_mux->current_ssrc = g_value_get_uint - (gst_structure_get_value (structure, "ssrc")); - } - } + gst_structure_get_uint (structure, "ssrc", &rtp_mux->current_ssrc); gst_caps_unref (caps); diff --git a/tests/check/elements/rtpmux.c b/tests/check/elements/rtpmux.c index 2a81294d6e..60683b76e8 100644 --- a/tests/check/elements/rtpmux.c +++ b/tests/check/elements/rtpmux.c @@ -226,7 +226,7 @@ basic_check_cb (GstPad * pad, int i) fail_unless (buffers && g_list_length (buffers) == 1); gst_rtp_buffer_map (buffers->data, GST_MAP_READ, &rtpbuffer); - fail_unless (gst_rtp_buffer_get_ssrc (&rtpbuffer) == 55); + fail_unless (gst_rtp_buffer_get_ssrc (&rtpbuffer) == 66); fail_unless (gst_rtp_buffer_get_timestamp (&rtpbuffer) == 200 - 57 + 1000 + i); fail_unless (gst_rtp_buffer_get_seq (&rtpbuffer) == 100 + 1 + i); @@ -260,7 +260,7 @@ lock_check_cb (GstPad * pad, int i) fail_unless (buffers && g_list_length (buffers) == 1); gst_rtp_buffer_map (buffers->data, GST_MAP_READ, &rtpbuffer); - fail_unless (gst_rtp_buffer_get_ssrc (&rtpbuffer) == 55); + fail_unless (gst_rtp_buffer_get_ssrc (&rtpbuffer) == 66); fail_unless (gst_rtp_buffer_get_timestamp (&rtpbuffer) == 200 - 57 + 1000 + i); fail_unless (gst_rtp_buffer_get_seq (&rtpbuffer) == 100 + 1 + i);