X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Frtp%2Fgstrtpopuspay.c;h=871a18248ec2a5a08fc1ce808d9600e1e7dff996;hb=refs%2Ftags%2Fsubmit%2Ftizen%2F20210423.074026;hp=7a36dceaaf9e45643583ab940a4b88d94b53e92a;hpb=4df223f3257f29a14086b17c7904b13b71d5ab80;p=platform%2Fupstream%2Fgst-plugins-good.git diff --git a/gst/rtp/gstrtpopuspay.c b/gst/rtp/gstrtpopuspay.c index 7a36dce..871a182 100644 --- a/gst/rtp/gstrtpopuspay.c +++ b/gst/rtp/gstrtpopuspay.c @@ -26,8 +26,10 @@ #include #include +#include #include "gstrtpopuspay.h" +#include "gstrtputils.h" GST_DEBUG_CATEGORY_STATIC (rtpopuspay_debug); #define GST_CAT_DEFAULT (rtpopuspay_debug) @@ -37,7 +39,7 @@ static GstStaticPadTemplate gst_rtp_opus_pay_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-opus, multistream = (boolean) FALSE") + GST_STATIC_CAPS ("audio/x-opus, channel-mapping-family = (int) 0") ); static GstStaticPadTemplate gst_rtp_opus_pay_src_template = @@ -54,6 +56,8 @@ GST_STATIC_PAD_TEMPLATE ("src", static gboolean gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps); +static GstCaps *gst_rtp_opus_pay_getcaps (GstRTPBasePayload * payload, + GstPad * pad, GstCaps * filter); static GstFlowReturn gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload * payload, GstBuffer * buffer); @@ -69,12 +73,13 @@ gst_rtp_opus_pay_class_init (GstRtpOPUSPayClass * klass) element_class = GST_ELEMENT_CLASS (klass); 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; - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_rtp_opus_pay_src_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_rtp_opus_pay_sink_template)); + gst_element_class_add_static_pad_template (element_class, + &gst_rtp_opus_pay_src_template); + gst_element_class_add_static_pad_template (element_class, + &gst_rtp_opus_pay_sink_template); gst_element_class_set_static_metadata (element_class, "RTP Opus payloader", @@ -97,27 +102,36 @@ gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) gboolean res; GstCaps *src_caps; GstStructure *s; - char *encoding_name; + const char *encoding_name = "OPUS"; gint channels, rate; const char *sprop_stereo = NULL; char *sprop_maxcapturerate = NULL; src_caps = gst_pad_get_allowed_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload)); if (src_caps) { - src_caps = gst_caps_make_writable (src_caps); - src_caps = gst_caps_truncate (src_caps); + GstStructure *s; + const GValue *value; + s = gst_caps_get_structure (src_caps, 0); - gst_structure_fixate_field_string (s, "encoding-name", "OPUS"); - encoding_name = g_strdup (gst_structure_get_string (s, "encoding-name")); + + if (gst_structure_has_field (s, "encoding-name")) { + GValue default_value = G_VALUE_INIT; + + g_value_init (&default_value, G_TYPE_STRING); + g_value_set_static_string (&default_value, encoding_name); + + value = gst_structure_get_value (s, "encoding-name"); + if (!gst_value_can_intersect (&default_value, value)) + encoding_name = "X-GST-OPUS-DRAFT-SPITTKA-00"; + } gst_caps_unref (src_caps); - } else { - encoding_name = g_strdup ("X-GST-OPUS-DRAFT-SPITTKA-00"); } s = gst_caps_get_structure (caps, 0); if (gst_structure_get_int (s, "channels", &channels)) { if (channels > 2) { - GST_ERROR_OBJECT (payload, "More than 2 channels are not supported yet"); + GST_ERROR_OBJECT (payload, + "More than 2 channels with channel-mapping-family=0 is invalid"); return FALSE; } else if (channels == 2) { sprop_stereo = "1"; @@ -132,7 +146,6 @@ gst_rtp_opus_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) gst_rtp_base_payload_set_options (payload, "audio", FALSE, encoding_name, 48000); - g_free (encoding_name); if (sprop_maxcapturerate && sprop_stereo) { res = @@ -167,7 +180,10 @@ gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload * basepayload, dts = GST_BUFFER_DTS (buffer); duration = GST_BUFFER_DURATION (buffer); - outbuf = gst_rtp_buffer_new_allocate (0, 0, 0); + outbuf = gst_rtp_base_payload_allocate_output_buffer (basepayload, 0, 0, 0); + + gst_rtp_copy_audio_meta (basepayload, outbuf, buffer); + outbuf = gst_buffer_append (outbuf, buffer); GST_BUFFER_PTS (outbuf) = pts; @@ -177,3 +193,69 @@ gst_rtp_opus_pay_handle_buffer (GstRTPBasePayload * basepayload, /* Push out */ 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; +} + +gboolean +gst_rtp_opus_pay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpopuspay", + GST_RANK_PRIMARY, GST_TYPE_RTP_OPUS_PAY); +}