mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpopuspay: Forward stereo preferences from caps upstream

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=746617
This commit is contained in:
Olivier Crête 2015-03-24 13:57:54 -04:00 committed by Tim-Philipp Müller
parent 4df223f325
commit 89b172b3ed
1 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
gst/rtp/gstrtpopuspay.c
View file

@ -54,6 +54,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
static gboolean gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload, static gboolean gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload,
GstCaps * caps); GstCaps * caps);
static GstCaps *gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload,
GstPad * pad, GstCaps * filter);
static GstFlowReturn gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload * static GstFlowReturn gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload *
payload, GstBuffer * buffer); payload, GstBuffer * buffer);
@ -69,6 +71,7 @@ gst_rtp_opus_pay_class_init (GstRtpOPUSPayClass * klass)
element_class = GST_ELEMENT_CLASS (klass); element_class = GST_ELEMENT_CLASS (klass);
gstbasertppayload_class->set_caps = gst_rtp_opus_pay_setcaps; gstbasertppayload_class->set_caps = gst_rtp_opus_pay_setcaps;
gstbasertppayload_class->get_caps = gst_rtp_opus_pay_getcaps;
gstbasertppayload_class->handle_buffer = gst_rtp_opus_pay_handle_buffer; gstbasertppayload_class->handle_buffer = gst_rtp_opus_pay_handle_buffer;
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
@ -117,7 +120,8 @@ gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);
if (gst_structure_get_int (s, "channels", &channels)) { if (gst_structure_get_int (s, "channels", &channels)) {
if (channels > 2) { if (channels > 2) {
GST_ERROR_OBJECT (payload, "More than 2 channels are not supported yet"); GST_ERROR_OBJECT (payload,
"More than 2 channels with multistream=FALSE is invalid");
return FALSE; return FALSE;
} else if (channels == 2) { } else if (channels == 2) {
sprop_stereo = "1"; sprop_stereo = "1";
@ -177,3 +181,62 @@ gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload * basepayload,
/* Push out */ /* Push out */
return gst_rtp_base_payload_push (basepayload, outbuf); return gst_rtp_base_payload_push (basepayload, outbuf);
} }
static GstCaps *
gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload,
GstPad * pad, GstCaps * filter)
{
GstCaps *caps, *peercaps, *tcaps;
GstStructure *s;
const gchar *stereo;
if (pad == GST_RTP_BASE_PAYLOAD_SRCPAD (payload))
return
GST_RTP_BASE_PAYLOAD_CLASS (gst_rtp_opus_pay_parent_class)->get_caps
(payload, pad, filter);
tcaps = gst_pad_get_pad_template_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload));
peercaps = gst_pad_peer_query_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload),
tcaps);
gst_caps_unref (tcaps);
if (!peercaps)
return
GST_RTP_BASE_PAYLOAD_CLASS (gst_rtp_opus_pay_parent_class)->get_caps
(payload, pad, filter);
if (gst_caps_is_empty (peercaps))
return peercaps;
caps = gst_pad_get_pad_template_caps (GST_RTP_BASE_PAYLOAD_SINKPAD (payload));
s = gst_caps_get_structure (peercaps, 0);
stereo = gst_structure_get_string (s, "stereo");
if (stereo != NULL) {
caps = gst_caps_make_writable (caps);
if (!strcmp (stereo, "1")) {
GstCaps *caps2 = gst_caps_copy (caps);
gst_caps_set_simple (caps, "channels", G_TYPE_INT, 2, NULL);
gst_caps_set_simple (caps2, "channels", G_TYPE_INT, 1, NULL);
caps = gst_caps_merge (caps, caps2);
} else if (!strcmp (stereo, "0")) {
GstCaps *caps2 = gst_caps_copy (caps);
gst_caps_set_simple (caps, "channels", G_TYPE_INT, 1, NULL);
gst_caps_set_simple (caps2, "channels", G_TYPE_INT, 2, NULL);
caps = gst_caps_merge (caps, caps2);
}
}
gst_caps_unref (peercaps);
if (filter) {
GstCaps *tmp = gst_caps_intersect_full (caps, filter,
GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (caps);
caps = tmp;
}
GST_DEBUG_OBJECT (payload, "Returning caps: %" GST_PTR_FORMAT, caps);
return caps;
}