#include <string.h>
#include <gst/rtp/gstrtpbuffer.h>
+#include <gst/audio/audio.h>
#include "gstrtpopuspay.h"
+#include "gstrtputils.h"
GST_DEBUG_CATEGORY_STATIC (rtpopuspay_debug);
#define GST_CAT_DEFAULT (rtpopuspay_debug)
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 =
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",
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 with multistream=FALSE is invalid");
+ "More than 2 channels with channel-mapping-family=0 is invalid");
return FALSE;
} else if (channels == 2) {
sprop_stereo = "1";
gst_rtp_base_payload_set_options (payload, "audio", FALSE,
encoding_name, 48000);
- g_free (encoding_name);
if (sprop_maxcapturerate && sprop_stereo) {
res =
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;
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);
+}