summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--gst/rtp/Makefile.am3
-rw-r--r--gst/rtp/gstrtp.c8
-rw-r--r--gst/rtp/gstrtpL16depay.c321
-rw-r--r--gst/rtp/gstrtpL16depay.h20
-rw-r--r--gst/rtp/gstrtpL16pay.c349
-rw-r--r--gst/rtp/gstrtpL16pay.h56
7 files changed, 323 insertions, 454 deletions
diff --git a/ChangeLog b/ChangeLog
index fc27e6fd..fe0eb615 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2007-01-24 Wim Taymans <wim@fluendo.com>
+ * gst/rtp/Makefile.am:
+ * gst/rtp/gstrtp.c: (plugin_init):
+ * gst/rtp/gstrtpL16depay.c: (gst_rtp_L16_depay_base_init),
+ (gst_rtp_L16_depay_class_init), (gst_rtp_L16_depay_init),
+ (gst_rtp_L16_depay_parse_int), (gst_rtp_L16_depay_setcaps),
+ (gst_rtp_L16_depay_process), (gst_rtp_L16_depay_set_property),
+ (gst_rtp_L16_depay_get_property), (gst_rtp_L16_depay_change_state),
+ (gst_rtp_L16_depay_plugin_init):
+ * gst/rtp/gstrtpL16depay.h:
+ * gst/rtp/gstrtpL16pay.c: (gst_rtp_L16_pay_get_type),
+ (gst_rtp_L16_pay_base_init), (gst_rtp_L16_pay_class_init),
+ (gst_rtp_L16_pay_init), (gst_rtp_L16_pay_finalize),
+ (gst_rtp_L16_pay_setcaps), (gst_rtp_L16_pay_handle_buffer),
+ (gst_rtp_L16_pay_plugin_init):
+ * gst/rtp/gstrtpL16pay.h:
+ Port and enable raw audio payloader/depayloader. Needs a bit more work
+ on the payloader side.
+
+2007-01-24 Wim Taymans <wim@fluendo.com>
+
* gst/rtsp/gstrtspsrc.c: (pad_blocked),
(gst_rtspsrc_stream_configure_transport),
(gst_rtspsrc_activate_streams), (gst_rtspsrc_loop_udp):
diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 1273800c..284d0547 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -21,6 +21,8 @@ libgstrtp_la_SOURCES = \
gstrtph263ppay.c \
gstrtph263pay.c \
gstrtph264depay.c \
+ gstrtpL16depay.c \
+ gstrtpL16pay.c \
gstasteriskh263.c \
gstrtpmp2tdepay.c \
gstrtpmp4vdepay.c \
@@ -35,7 +37,6 @@ libgstrtp_la_SOURCES = \
gstrtpvorbisdepay.c \
gstrtpvorbispay.c
-#gstrtpL16pay.c gstrtpL16depay.c
if HAVE_WINSOCK2_H
WINSOCK2_LIBS = -lws2_32
diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c
index 9dffaee1..61544895 100644
--- a/gst/rtp/gstrtp.c
+++ b/gst/rtp/gstrtp.c
@@ -40,6 +40,8 @@
#include "gstrtph263ppay.h"
#include "gstrtph263pay.h"
#include "gstrtph264depay.h"
+#include "gstrtpL16depay.h"
+#include "gstrtpL16pay.h"
#include "gstasteriskh263.h"
#include "gstrtpmp2tdepay.h"
#include "gstrtpmp4vdepay.h"
@@ -114,6 +116,12 @@ plugin_init (GstPlugin * plugin)
if (!gst_rtp_h264_depay_plugin_init (plugin))
return FALSE;
+ if (!gst_rtp_L16_pay_plugin_init (plugin))
+ return FALSE;
+
+ if (!gst_rtp_L16_depay_plugin_init (plugin))
+ return FALSE;
+
if (!gst_asteriskh263_plugin_init (plugin))
return FALSE;
diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c
index bffbcbd4..1f37a22f 100644
--- a/gst/rtp/gstrtpL16depay.c
+++ b/gst/rtp/gstrtpL16depay.c
@@ -1,5 +1,5 @@
/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2007> Wim Taymans <wim@fluendo.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -21,293 +21,258 @@
#include "config.h"
#endif
#include <string.h>
+
#include "gstrtpL16depay.h"
-#include "gstrtp-common.h"
+
+GST_DEBUG_CATEGORY_STATIC (rtpL16depay_debug);
+#define GST_CAT_DEFAULT (rtpL16depay_debug)
/* elementfactory information */
-static const GstElementDetails gst_rtp_L16depay_details =
+static const GstElementDetails gst_rtp_L16_depay_details =
GST_ELEMENT_DETAILS ("RTP packet depayloader",
"Codec/Depayloader/Network",
"Extracts raw audio from RTP packets",
- "Zeeshan Ali <zak147@yahoo.com>");
+ "Zeeshan Ali <zak147@yahoo.com>," "Wim Taymans <wim@fluendo.com>");
/* RtpL16Depay signals and args */
enum
{
- /* FILL ME */
LAST_SIGNAL
};
enum
{
ARG_0,
- ARG_FREQUENCY,
- ARG_PAYLOAD_TYPE
};
-static GstStaticPadTemplate gst_rtp_L16depay_src_template =
+static GstStaticPadTemplate gst_rtp_L16_depay_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, "
- "endianness = (int) BYTE_ORDER, "
+ "endianness = (int) BIG_ENDIAN, "
"signed = (boolean) true, "
"width = (int) 16, "
"depth = (int) 16, "
- "rate = (int) [ 1000, 48000 ], " "channels = (int) [ 1, 2 ]")
+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]")
);
-static GstStaticPadTemplate gst_rtp_L16depay_sink_template =
-GST_STATIC_PAD_TEMPLATE ("sink",
+static GstStaticPadTemplate gst_rtp_L16_depay_sink_template =
+ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("application/x-rtp")
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+ "clock-rate = (int) [ 1, MAX ], "
+ /* "channels = (int) [1, MAX]" */
+ /* "emphasis = (string) ANY" */
+ /* "channel-order = (string) ANY" */
+ "encoding-name = (string) \"L16\";"
+ "application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) { " GST_RTP_PAYLOAD_L16_STEREO_STRING ", "
+ GST_RTP_PAYLOAD_L16_MONO_STRING " }," "clock-rate = (int) [ 1, MAX ]"
+ /* "channels = (int) [1, MAX]" */
+ /* "emphasis = (string) ANY" */
+ /* "channel-order = (string) ANY" */
+ )
);
-static void gst_rtp_L16depay_class_init (GstRtpL16DepayClass * klass);
-static void gst_rtp_L16depay_base_init (GstRtpL16DepayClass * klass);
-static void gst_rtp_L16depay_init (GstRtpL16Depay * rtpL16depay);
+GST_BOILERPLATE (GstRtpL16Depay, gst_rtp_L16_depay, GstBaseRTPDepayload,
+ GST_TYPE_BASE_RTP_DEPAYLOAD);
-static void gst_rtp_L16depay_chain (GstPad * pad, GstData * _data);
+static gboolean gst_rtp_L16_depay_setcaps (GstBaseRTPDepayload * depayload,
+ GstCaps * caps);
+static GstBuffer *gst_rtp_L16_depay_process (GstBaseRTPDepayload * depayload,
+ GstBuffer * buf);
-static void gst_rtp_L16depay_set_property (GObject * object, guint prop_id,
+static void gst_rtp_L16_depay_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
-static void gst_rtp_L16depay_get_property (GObject * object, guint prop_id,
+static void gst_rtp_L16_depay_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
-static GstStateChangeReturn gst_rtp_L16depay_change_state (GstElement *
- element);
-
-static GstElementClass *parent_class = NULL;
-static GType
-gst_rtp_L16depay_get_type (void)
-{
- static GType rtpL16depay_type = 0;
-
- if (!rtpL16depay_type) {
- static const GTypeInfo rtpL16depay_info = {
- sizeof (GstRtpL16DepayClass),
- (GBaseInitFunc) gst_rtp_L16depay_base_init,
- NULL,
- (GClassInitFunc) gst_rtp_L16depay_class_init,
- NULL,
- NULL,
- sizeof (GstRtpL16Depay),
- 0,
- (GInstanceInitFunc) gst_rtp_L16depay_init,
- };
-
- rtpL16depay_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstRtpL16Depay",
- &rtpL16depay_info, 0);
- }
- return rtpL16depay_type;
-}
+static GstStateChangeReturn gst_rtp_L16_depay_change_state (GstElement *
+ element, GstStateChange transition);
static void
-gst_rtp_L16depay_base_init (GstRtpL16DepayClass * klass)
+gst_rtp_L16_depay_base_init (gpointer klass)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_rtp_L16depay_src_template));
+ gst_static_pad_template_get (&gst_rtp_L16_depay_src_template));
gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_rtp_L16depay_sink_template));
- gst_element_class_set_details (element_class, &gst_rtp_L16depay_details);
+ gst_static_pad_template_get (&gst_rtp_L16_depay_sink_template));
+
+ gst_element_class_set_details (element_class, &gst_rtp_L16_depay_details);
}
static void
-gst_rtp_L16depay_class_init (GstRtpL16DepayClass * klass)
+gst_rtp_L16_depay_class_init (GstRtpL16DepayClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
+ GstBaseRTPDepayloadClass *gstbasertpdepayload_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
+ gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass;
parent_class = g_type_class_peek_parent (klass);
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PAYLOAD_TYPE,
- g_param_spec_int ("payload_type", "payload_type", "payload type",
- G_MININT, G_MAXINT, PAYLOAD_L16_STEREO, G_PARAM_READABLE));
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FREQUENCY,
- g_param_spec_int ("frequency", "frequency", "frequency",
- G_MININT, G_MAXINT, 44100, G_PARAM_READWRITE));
+ gobject_class->set_property = gst_rtp_L16_depay_set_property;
+ gobject_class->get_property = gst_rtp_L16_depay_get_property;
+
+ gstelement_class->change_state = gst_rtp_L16_depay_change_state;
- gobject_class->set_property = gst_rtp_L16depay_set_property;
- gobject_class->get_property = gst_rtp_L16depay_get_property;
+ gstbasertpdepayload_class->set_caps = gst_rtp_L16_depay_setcaps;
+ gstbasertpdepayload_class->process = gst_rtp_L16_depay_process;
- gstelement_class->change_state = gst_rtp_L16depay_change_state;
+ GST_DEBUG_CATEGORY_INIT (rtpL16depay_debug, "rtpL16depay", 0,
+ "Raw Audio RTP Depayloader");
}
static void
-gst_rtp_L16depay_init (GstRtpL16Depay * rtpL16depay)
+gst_rtp_L16_depay_init (GstRtpL16Depay * rtpL16depay,
+ GstRtpL16DepayClass * klass)
{
- rtpL16depay->srcpad =
- gst_pad_new_from_static_template (&gst_rtp_L16depay_src_template, "src");
- rtpL16depay->sinkpad =
- gst_pad_new_from_static_template (&gst_rtp_L16depay_sink_template,
- "sink");
- gst_element_add_pad (GST_ELEMENT (rtpL16depay), rtpL16depay->srcpad);
- gst_element_add_pad (GST_ELEMENT (rtpL16depay), rtpL16depay->sinkpad);
- gst_pad_set_chain_function (rtpL16depay->sinkpad, gst_rtp_L16depay_chain);
-
- rtpL16depay->frequency = 44100;
- rtpL16depay->channels = 2;
-
- rtpL16depay->payload_type = PAYLOAD_L16_STEREO;
}
-void
-gst_rtp_L16depay_ntohs (GstBuffer * buf)
+static gint
+gst_rtp_L16_depay_parse_int (GstStructure * structure, const gchar * field,
+ gint def)
{
- gint16 *i, *len;
+ const gchar *str;
+ gint res;
- /* FIXME: is this code correct or even sane at all? */
- i = (gint16 *) GST_BUFFER_DATA (buf);
- len = i + GST_BUFFER_SIZE (buf) / sizeof (gint16 *);
+ if ((str = gst_structure_get_string (structure, field)))
+ return atoi (str);
- for (; i < len; i++) {
- *i = g_ntohs (*i);
- }
+ if (gst_structure_get_int (structure, field, &res))
+ return res;
+
+ return def;
}
-void
-gst_rtp_L16_caps_nego (GstRtpL16Depay * rtpL16depay)
+static gboolean
+gst_rtp_L16_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
{
- GstCaps *caps;
-
- caps =
- gst_caps_copy (gst_static_caps_get (&gst_rtp_L16depay_src_template.
- static_caps));
+ GstStructure *structure;
+ GstRtpL16Depay *rtpL16depay;
+ gint clock_rate, payload;
+ gint channels;
+ GstCaps *srccaps;
- gst_caps_set_simple (caps,
- "rate", G_TYPE_INT, rtpL16depay->frequency,
- "channel", G_TYPE_INT, rtpL16depay->channels, NULL);
+ rtpL16depay = GST_RTP_L16_DEPAY (depayload);
- gst_pad_try_set_caps (rtpL16depay->srcpad, caps);
-}
+ structure = gst_caps_get_structure (caps, 0);
-void
-gst_rtp_L16depay_payloadtype_change (GstRtpL16Depay * rtpL16depay,
- rtp_payload_t pt)
-{
- rtpL16depay->payload_type = pt;
-
- switch (pt) {
- case PAYLOAD_L16_MONO:
- rtpL16depay->channels = 1;
+ payload = 96;
+ gst_structure_get_int (structure, "payload", &payload);
+ switch (payload) {
+ case GST_RTP_PAYLOAD_L16_STEREO:
+ channels = 2;
+ clock_rate = 44100;
break;
- case PAYLOAD_L16_STEREO:
- rtpL16depay->channels = 2;
+ case GST_RTP_PAYLOAD_L16_MONO:
+ channels = 1;
+ clock_rate = 44100;
break;
default:
- g_warning ("unknown payload_t %d\n", pt);
+ channels = 0;
+ clock_rate = 0;
+ break;
}
- gst_rtp_L16_caps_nego (rtpL16depay);
+ /* caps can overwrite defaults */
+ clock_rate =
+ gst_rtp_L16_depay_parse_int (structure, "clock-rate", clock_rate);
+ channels = gst_rtp_L16_depay_parse_int (structure, "channels", channels);
+
+ depayload->clock_rate = clock_rate;
+ rtpL16depay->rate = clock_rate;
+ rtpL16depay->channels = channels;
+
+ srccaps = gst_caps_new_simple ("audio/x-raw-int",
+ "endianness", G_TYPE_INT, G_BIG_ENDIAN,
+ "signed", G_TYPE_BOOLEAN, TRUE,
+ "width", G_TYPE_INT, 16,
+ "depth", G_TYPE_INT, 16,
+ "rate", G_TYPE_INT, clock_rate, "channels", G_TYPE_INT, channels, NULL);
+
+ gst_pad_set_caps (depayload->srcpad, srccaps);
+ gst_caps_unref (srccaps);
+
+ return TRUE;
}
-static void
-gst_rtp_L16depay_chain (GstPad * pad, GstData * _data)
+static GstBuffer *
+gst_rtp_L16_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
{
- GstBuffer *buf = GST_BUFFER (_data);
GstRtpL16Depay *rtpL16depay;
GstBuffer *outbuf;
- Rtp_Packet packet;
- rtp_payload_t pt;
- g_return_if_fail (pad != NULL);
- g_return_if_fail (GST_IS_PAD (pad));
- g_return_if_fail (buf != NULL);
+ rtpL16depay = GST_RTP_L16_DEPAY (depayload);
- rtpL16depay = GST_RTP_L16_DEPAY (GST_OBJECT_PARENT (pad));
+ if (!gst_rtp_buffer_validate (buf))
+ goto bad_packet;
- g_return_if_fail (rtpL16depay != NULL);
- g_return_if_fail (GST_IS_RTP_L16_DEPAY (rtpL16depay));
+ {
+ gint payload_len;
+ guint8 *payload;
- if (GST_IS_EVENT (buf)) {
- GstEvent *event = GST_EVENT (buf);
+ payload_len = gst_rtp_buffer_get_payload_len (buf);
+ payload = gst_rtp_buffer_get_payload (buf);
- gst_pad_event_default (pad, event);
+ if (payload_len <= 0)
+ goto empty_packet;
- return;
- }
-
- if (GST_PAD_CAPS (rtpL16depay->srcpad) == NULL) {
- gst_rtp_L16_caps_nego (rtpL16depay);
- }
+ GST_DEBUG_OBJECT (rtpL16depay, "got payload of %d bytes", payload_len);
- packet =
- rtp_packet_new_copy_data (GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
+ outbuf = gst_rtp_buffer_get_payload_buffer (buf);
- pt = rtp_packet_get_payload_type (packet);
-
- if (pt != rtpL16depay->payload_type) {
- gst_rtp_L16depay_payloadtype_change (rtpL16depay, pt);
+ return outbuf;
}
+ return NULL;
- outbuf = gst_buffer_new ();
- GST_BUFFER_SIZE (outbuf) = rtp_packet_get_payload_len (packet);
- GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (outbuf));
- GST_BUFFER_TIMESTAMP (outbuf) =
- g_ntohl (rtp_packet_get_timestamp (packet)) * GST_SECOND;
-
- memcpy (GST_BUFFER_DATA (outbuf), rtp_packet_get_payload (packet),
- GST_BUFFER_SIZE (outbuf));
-
- GST_DEBUG ("gst_rtp_L16depay_chain: pushing buffer of size %d",
- GST_BUFFER_SIZE (outbuf));
-
- /* FIXME: According to RFC 1890, this is required, right? */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- gst_rtp_L16depay_ntohs (outbuf);
-#endif
-
- gst_pad_push (rtpL16depay->srcpad, GST_DATA (outbuf));
-
- rtp_packet_free (packet);
- gst_buffer_unref (buf);
+bad_packet:
+ {
+ GST_ELEMENT_WARNING (rtpL16depay, STREAM, DECODE,
+ ("Packet did not validate."), (NULL));
+ return NULL;
+ }
+empty_packet:
+ {
+ GST_ELEMENT_WARNING (rtpL16depay, STREAM, DECODE,
+ ("Empty Payload."), (NULL));
+ return NULL;
+ }
}
static void
-gst_rtp_L16depay_set_property (GObject * object, guint prop_id,
+gst_rtp_L16_depay_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstRtpL16Depay *rtpL16depay;
- g_return_if_fail (GST_IS_RTP_L16_DEPAY (object));
rtpL16depay = GST_RTP_L16_DEPAY (object);
switch (prop_id) {
- case ARG_PAYLOAD_TYPE:
- gst_rtp_L16depay_payloadtype_change (rtpL16depay,
- g_value_get_int (value));
- break;
- case ARG_FREQUENCY:
- rtpL16depay->frequency = g_value_get_int (value);
- break;
default:
break;
}
}
static void
-gst_rtp_L16depay_get_property (GObject * object, guint prop_id, GValue * value,
+gst_rtp_L16_depay_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec)
{
GstRtpL16Depay *rtpL16depay;
- g_return_if_fail (GST_IS_RTP_L16_DEPAY (object));
rtpL16depay = GST_RTP_L16_DEPAY (object);
switch (prop_id) {
- case ARG_PAYLOAD_TYPE:
- g_value_set_int (value, rtpL16depay->payload_type);
- break;
- case ARG_FREQUENCY:
- g_value_set_int (value, rtpL16depay->frequency);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -315,23 +280,20 @@ gst_rtp_L16depay_get_property (GObject * object, guint prop_id, GValue * value,
}
static GstStateChangeReturn
-gst_rtp_L16depay_change_state (GstElement * element, GstStateChange transition)
+gst_rtp_L16_depay_change_state (GstElement * element, GstStateChange transition)
{
GstRtpL16Depay *rtpL16depay;
GstStateChangeReturn ret;
rtpL16depay = GST_RTP_L16_DEPAY (element);
- GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
-
-
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
break;
default:
break;
}
- /* if we haven't failed already, give the parent class a chance to ;-) */
+
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
@@ -340,12 +302,11 @@ gst_rtp_L16depay_change_state (GstElement * element, GstStateChange transition)
default:
break;
}
-
return ret;
}
gboolean
-gst_rtp_L16depay_plugin_init (GstPlugin * plugin)
+gst_rtp_L16_depay_plugin_init (GstPlugin * plugin)
{
return gst_element_register (plugin, "rtpL16depay",
GST_RANK_MARGINAL, GST_TYPE_RTP_L16_DEPAY);
diff --git a/gst/rtp/gstrtpL16depay.h b/gst/rtp/gstrtpL16depay.h
index d90924e1..1286719c 100644
--- a/gst/rtp/gstrtpL16depay.h
+++ b/gst/rtp/gstrtpL16depay.h
@@ -1,5 +1,5 @@
/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2007> Wim Taymans <wim@fluendo.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -21,14 +21,13 @@
#define __GST_RTP_L16_DEPAY_H__
#include <gst/gst.h>
-#include "rtp-packet.h"
-#include "gstrtp-common.h"
+#include <gst/rtp/gstbasertpdepayload.h>
G_BEGIN_DECLS
/* Standard macros for defining types for this element. */
#define GST_TYPE_RTP_L16_DEPAY \
- (gst_rtp_L16depay_get_type())
+ (gst_rtp_L16_depay_get_type())
#define GST_RTP_L16_DEPAY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_DEPAY,GstRtpL16Depay))
#define GST_RTP_L16_DEPAY_CLASS(klass) \
@@ -44,24 +43,19 @@ typedef struct _GstRtpL16DepayClass GstRtpL16DepayClass;
/* Definition of structure storing data for this element. */
struct _GstRtpL16Depay
{
- GstElement element;
+ GstBaseRTPDepayload depayload;
- GstPad *sinkpad;
- GstPad *srcpad;
-
- guint frequency;
+ guint rate;
guint channels;
-
- rtp_payload_t payload_type;
};
/* Standard definition defining a class for this element. */
struct _GstRtpL16DepayClass
{
- GstElementClass parent_class;
+ GstBaseRTPDepayloadClass parent_class;
};
-gboolean gst_rtp_L16depay_plugin_init (GstPlugin * plugin);
+gboolean gst_rtp_L16_depay_plugin_init (GstPlugin * plugin);
G_END_DECLS
diff --git a/gst/rtp/gstrtpL16pay.c b/gst/rtp/gstrtpL16pay.c
index 27e25ba7..4923fd5b 100644
--- a/gst/rtp/gstrtpL16pay.c
+++ b/gst/rtp/gstrtpL16pay.c
@@ -1,5 +1,5 @@
/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2007> Wim Taymans <wim@fluendo.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -18,329 +18,224 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
+
#include <string.h>
-#include <stdlib.h>
+
+#include <gst/rtp/gstrtpbuffer.h>
+
#include "gstrtpL16pay.h"
+GST_DEBUG_CATEGORY_STATIC (rtpL16pay_debug);
+#define GST_CAT_DEFAULT (rtpL16pay_debug)
+
/* elementfactory information */
-static const GstElementDetails gst_rtpL16pay_details =
-GST_ELEMENT_DETAILS ("RTP RAW audio payloader",
+static const GstElementDetails gst_rtp_L16_pay_details =
+GST_ELEMENT_DETAILS ("RTP packet payloader",
"Codec/Payloader/Network",
- "Payload-encodes Raw Audio into a RTP packet",
- "Zeeshan Ali <zak147@yahoo.com>");
+ "Payload-encode Raw audio into RTP packets (RFC 3551)",
+ "Wim Taymans <wim@fluendo.com>");
-/* RtpL16Pay signals and args */
-enum
-{
- /* FILL ME */
- LAST_SIGNAL
-};
-
-enum
-{
- /* FILL ME */
- ARG_0
-};
-
-static GstStaticPadTemplate gst_rtpL16pay_sink_template =
+static GstStaticPadTemplate gst_rtp_L16_pay_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, "
- "endianness = (int) BYTE_ORDER, "
+ "endianness = (int) BIG_ENDIAN, "
"signed = (boolean) true, "
"width = (int) 16, "
"depth = (int) 16, "
- "rate = (int) [ 1000, 48000 ], " "channels = (int) [ 1, 2 ]")
+ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ]")
);
-static GstStaticPadTemplate gst_rtpL16pay_src_template =
-GST_STATIC_PAD_TEMPLATE ("src",
+static GstStaticPadTemplate gst_rtp_L16_pay_src_template =
+ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("application/x-rtp")
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) [ 96, 127 ], "
+ "clock-rate = (int) [ 1, MAX ], "
+ "encoding-name = (string) \"L16\", "
+ "channels = (int) [ 1, MAX ], "
+ "rate = (int) [ 1, MAX ];"
+ "application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) { " GST_RTP_PAYLOAD_L16_STEREO_STRING ", "
+ GST_RTP_PAYLOAD_L16_MONO_STRING " }," "clock-rate = (int) 44100")
);
-static void gst_rtpL16pay_class_init (GstRtpL16PayClass * klass);
-static void gst_rtpL16pay_base_init (GstRtpL16PayClass * klass);
-static void gst_rtpL16pay_init (GstRtpL16Pay * rtpL16enc);
-static void gst_rtpL16pay_chain (GstPad * pad, GstData * _data);
-static void gst_rtpL16pay_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_rtpL16pay_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-static GstPadLinkReturn gst_rtpL16pay_sinkconnect (GstPad * pad,
- const GstCaps * caps);
-static GstStateChangeReturn gst_rtpL16pay_change_state (GstElement * element,
- GstStateChange transition);
-
-static GstElementClass *parent_class = NULL;
+static void gst_rtp_L16_pay_class_init (GstRtpL16PayClass * klass);
+static void gst_rtp_L16_pay_base_init (GstRtpL16PayClass * klass);
+static void gst_rtp_L16_pay_init (GstRtpL16Pay * rtpL16pay);
+static void gst_rtp_L16_pay_finalize (GObject * object);
+
+static gboolean gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload,
+ GstCaps * caps);
+static GstFlowReturn gst_rtp_L16_pay_handle_buffer (GstBaseRTPPayload * pad,
+ GstBuffer * buffer);
+
+static GstBaseRTPPayloadClass *parent_class = NULL;
static GType
-gst_rtpL16pay_get_type (void)
+gst_rtp_L16_pay_get_type (void)
{
static GType rtpL16pay_type = 0;
if (!rtpL16pay_type) {
static const GTypeInfo rtpL16pay_info = {
sizeof (GstRtpL16PayClass),
- (GBaseInitFunc) gst_rtpL16pay_base_init,
+ (GBaseInitFunc) gst_rtp_L16_pay_base_init,
NULL,
- (GClassInitFunc) gst_rtpL16pay_class_init,
+ (GClassInitFunc) gst_rtp_L16_pay_class_init,
NULL,
NULL,
sizeof (GstRtpL16Pay),
0,
- (GInstanceInitFunc) gst_rtpL16pay_init,
+ (GInstanceInitFunc) gst_rtp_L16_pay_init,
};
rtpL16pay_type =
- g_type_register_static (GST_TYPE_ELEMENT, "GstRtpL16Pay",
+ g_type_register_static (GST_TYPE_BASE_RTP_PAYLOAD, "GstRtpL16Pay",
&rtpL16pay_info, 0);
}
return rtpL16pay_type;
}
static void
-gst_rtpL16pay_base_init (GstRtpL16PayClass * klass)
+gst_rtp_L16_pay_base_init (GstRtpL16PayClass * klass)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_rtpL16pay_sink_template));
+ gst_static_pad_template_get (&gst_rtp_L16_pay_src_template));
gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_rtpL16pay_src_template));
- gst_element_class_set_details (element_class, &gst_rtpL16pay_details);
+ gst_static_pad_template_get (&gst_rtp_L16_pay_sink_template));
+
+ gst_element_class_set_details (element_class, &gst_rtp_L16_pay_details);
}
static void
-gst_rtpL16pay_class_init (GstRtpL16PayClass * klass)
+gst_rtp_L16_pay_class_init (GstRtpL16PayClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
+ GstBaseRTPPayloadClass *gstbasertppayload_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
+ gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass;
parent_class = g_type_class_peek_parent (klass);
- gobject_class->set_property = gst_rtpL16pay_set_property;
- gobject_class->get_property = gst_rtpL16pay_get_property;
+ gobject_class->finalize = gst_rtp_L16_pay_finalize;
+
+ gstbasertppayload_class->set_caps = gst_rtp_L16_pay_setcaps;
+ gstbasertppayload_class->handle_buffer = gst_rtp_L16_pay_handle_buffer;
- gstelement_class->change_state = gst_rtpL16pay_change_state;
+ GST_DEBUG_CATEGORY_INIT (rtpL16pay_debug, "rtpL16pay", 0,
+ "L16 RTP Payloader");
}
static void
-gst_rtpL16pay_init (GstRtpL16Pay * rtpL16enc)
+gst_rtp_L16_pay_init (GstRtpL16Pay * rtpL16pay)
{
- rtpL16enc->sinkpad =
- gst_pad_new_from_static_template (&gst_rtpL16pay_sink_template, "sink");
- rtpL16enc->srcpad =
- gst_pad_new_from_static_template (&gst_rtpL16pay_src_template, "src");
- gst_element_add_pad (GST_ELEMENT (rtpL16enc), rtpL16enc->sinkpad);
- gst_element_add_pad (GST_ELEMENT (rtpL16enc), rtpL16enc->srcpad);
- gst_pad_set_chain_function (rtpL16enc->sinkpad, gst_rtpL16pay_chain);
- gst_pad_set_link_function (rtpL16enc->sinkpad, gst_rtpL16pay_sinkconnect);
-
- rtpL16enc->frequency = 44100;
- rtpL16enc->channels = 2;
-
- rtpL16enc->next_time = 0;
- rtpL16enc->time_interval = 0;
-
- rtpL16enc->seq = 0;
- rtpL16enc->ssrc = random ();
+ rtpL16pay->adapter = gst_adapter_new ();
}
-static GstPadLinkReturn
-gst_rtpL16pay_sinkconnect (GstPad * pad, const GstCaps * caps)
+static void
+gst_rtp_L16_pay_finalize (GObject * object)
{
- GstRtpL16Pay *rtpL16enc;
- GstStructure *structure;
- gboolean ret;
-
- rtpL16enc = GST_RTP_L16_PAY (gst_pad_get_parent (pad));
-
- structure = gst_caps_get_structure (caps, 0);
-
- ret = gst_structure_get_int (structure, "rate", &rtpL16enc->frequency);
- ret &= gst_structure_get_int (structure, "channels", &rtpL16enc->channels);
-
- if (!ret) {
- gst_object_unref (rtpL16enc);
- return GST_PAD_LINK_REFUSED;
- }
-
- /* Pre-calculate what we can */
- rtpL16enc->time_interval =
- GST_SECOND / (2 * rtpL16enc->channels * rtpL16enc->frequency);
-
- gst_object_unref (rtpL16enc);
-
- return GST_PAD_LINK_OK;
-}
-
+ GstRtpL16Pay *rtpL16pay;
-void
-gst_rtpL16pay_htons (GstBuffer * buf)
-{
- gint16 *i, *len;
+ rtpL16pay = GST_RTP_L16_PAY (object);
- /* FIXME: is this code correct or even sane at all? */
- i = (gint16 *) GST_BUFFER_DATA (buf);
- len = i + GST_BUFFER_SIZE (buf) / sizeof (gint16 *);
+ g_object_unref (rtpL16pay->adapter);
+ rtpL16pay->adapter = NULL;
- for (; i < len; i++) {
- *i = g_htons (*i);
- }
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static void
-gst_rtpL16pay_chain (GstPad * pad, GstData * _data)
+static gboolean
+gst_rtp_L16_pay_setcaps (GstBaseRTPPayload * basepayload, GstCaps * caps)
{
- GstBuffer *buf = GST_BUFFER (_data);
- GstRtpL16Pay *rtpL16enc;
- GstBuffer *outbuf;
- Rtp_Packet packet;
-
- g_return_if_fail (pad != NULL);
- g_return_if_fail (GST_IS_PAD (pad));
- g_return_if_fail (buf != NULL);
-
- rtpL16enc = GST_RTP_L16_PAY (GST_OBJECT_PARENT (pad));
-
- g_return_if_fail (rtpL16enc != NULL);
- g_return_if_fail (GST_IS_RTP_L16_PAY (rtpL16enc));
-
- if (GST_IS_EVENT (buf)) {
- GstEvent *event = GST_EVENT (buf);
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_DISCONTINUOUS:
- GST_DEBUG ("discont");
- rtpL16enc->next_time = 0;
- gst_pad_event_default (pad, event);
- return;
- default:
- gst_pad_event_default (pad, event);
- return;
- }
- }
-
- /* We only need the header */
- packet = rtp_packet_new_allocate (0, 0, 0);
-
- rtp_packet_set_csrc_count (packet, 0);
- rtp_packet_set_extension (packet, 0);
- rtp_packet_set_padding (packet, 0);
- rtp_packet_set_version (packet, RTP_VERSION);
- rtp_packet_set_marker (packet, 0);
- rtp_packet_set_ssrc (packet, g_htonl (rtpL16enc->ssrc));
- rtp_packet_set_seq (packet, g_htons (rtpL16enc->seq));
- rtp_packet_set_timestamp (packet,
- g_htonl ((guint32) rtpL16enc->next_time / GST_SECOND));
-
- if (rtpL16enc->channels == 1) {
- rtp_packet_set_payload_type (packet, (guint8) PAYLOAD_L16_MONO);
- }
-
- else {
- rtp_packet_set_payload_type (packet, (guint8) PAYLOAD_L16_STEREO);
- }
-
- /* FIXME: According to RFC 1890, this is required, right? */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- gst_rtpL16pay_htons (buf);
-#endif
-
- outbuf = gst_buffer_new ();
- GST_BUFFER_SIZE (outbuf) =
- rtp_packet_get_packet_len (packet) + GST_BUFFER_SIZE (buf);
- GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (outbuf));
- GST_BUFFER_TIMESTAMP (outbuf) = rtpL16enc->next_time;
+ GstRtpL16Pay *rtpL16pay;
+ GstStructure *structure;
+ gint channels, rate;
- memcpy (GST_BUFFER_DATA (outbuf), packet->data,
- rtp_packet_get_packet_len (packet));
- memcpy (GST_BUFFER_DATA (outbuf) + rtp_packet_get_packet_len (packet),
- GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
+ rtpL16pay = GST_RTP_L16_PAY (basepayload);
- GST_DEBUG ("gst_rtpL16pay_chain: pushing buffer of size %d",
- GST_BUFFER_SIZE (outbuf));
- gst_pad_push (rtpL16enc->srcpad, GST_DATA (outbuf));
+ structure = gst_caps_get_structure (caps, 0);
- ++rtpL16enc->seq;
- rtpL16enc->next_time += rtpL16enc->time_interval * GST_BUFFER_SIZE (buf);
+ /* first parse input caps */
+ if (!gst_structure_get_int (structure, "rate", &rate))
+ goto no_rate;
- rtp_packet_free (packet);
- gst_buffer_unref (buf);
-}
+ if (!gst_structure_get_int (structure, "channels", &channels))
+ goto no_channels;
-static void
-gst_rtpL16pay_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstRtpL16Pay *rtpL16enc;
+ gst_basertppayload_set_options (basepayload, "audio", TRUE, "L16", rate);
+ gst_basertppayload_set_outcaps (basepayload,
+ "channels", G_TYPE_INT, channels, "rate", G_TYPE_INT, rate, NULL);
- g_return_if_fail (GST_IS_RTP_L16_PAY (object));
- rtpL16enc = GST_RTP_L16_PAY (object);
+ return TRUE;
- switch (prop_id) {
- default:
- break;
+ /* ERRORS */
+no_rate:
+ {
+ GST_DEBUG_OBJECT (rtpL16pay, "no rate given");
+ return FALSE;
+ }
+no_channels:
+ {
+ GST_DEBUG_OBJECT (rtpL16pay, "no channels given");
+ return FALSE;
}
}
-static void
-gst_rtpL16pay_get_property (GObject * object, guint prop_id, GValue * value,
- GParamSpec * pspec)
+static GstFlowReturn
+gst_rtp_L16_pay_handle_buffer (GstBaseRTPPayload * basepayload,
+ GstBuffer * buffer)
{
- GstRtpL16Pay *rtpL16enc;
-
- g_return_if_fail (GST_IS_RTP_L16_PAY (object));
- rtpL16enc = GST_RTP_L16_PAY (object);
+ GstRtpL16Pay *rtpL16pay;
+ GstFlowReturn ret;
+ guint size, payload_len;
+ GstBuffer *outbuf;
+ guint8 *payload, *data;
+ GstClockTime timestamp;
+ guint packet_len, mtu;
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
+ rtpL16pay = GST_RTP_L16_PAY (basepayload);
+ mtu = GST_BASE_RTP_PAYLOAD_MTU (rtpL16pay);
-static GstStateChangeReturn
-gst_rtpL16pay_change_state (GstElement * element, GstStateChange transition)
-{
- GstRtpL16Pay *rtpL16enc;
+ size = GST_BUFFER_SIZE (buffer);
+ data = GST_BUFFER_DATA (buffer);
+ timestamp = GST_BUFFER_TIMESTAMP (buffer);
- g_return_val_if_fail (GST_IS_RTP_L16_PAY (element), GST_STATE_CHANGE_FAILURE);
+ GST_DEBUG_OBJECT (basepayload, "got %d bytes", size);
- rtpL16enc = GST_RTP_L16_PAY (element);
+ payload_len = size;
- GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
+ /* get packet len to check against MTU */
+ packet_len = gst_rtp_buffer_calc_packet_len (payload_len, 0, 0);
- /* if going down into NULL state, close the file if it's open */
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- break;
+ /* now alloc output buffer */
+ outbuf = gst_rtp_buffer_new_allocate (payload_len, 0, 0);
- case GST_STATE_CHANGE_READY_TO_NULL:
- break;
+ /* get payload, this is now writable */
+ payload = gst_rtp_buffer_get_payload (outbuf);
- default:
- break;
- }
+ gst_buffer_unref (buffer);
- /* if we haven't failed already, give the parent class a chance to ;-) */
- if (GST_ELEMENT_CLASS (parent_class)->change_state)
- return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+ ret = gst_basertppayload_push (basepayload, outbuf);
- return GST_STATE_CHANGE_SUCCESS;
+ return ret;
}
gboolean
-gst_rtpL16pay_plugin_init (GstPlugin * plugin)
+gst_rtp_L16_pay_plugin_init (GstPlugin * plugin)
{
- return gst_element_register (plugin, "rtpL16enc",
+ return gst_element_register (plugin, "rtpL16pay",
GST_RANK_NONE, GST_TYPE_RTP_L16_PAY);
}
diff --git a/gst/rtp/gstrtpL16pay.h b/gst/rtp/gstrtpL16pay.h
index 8c44f81d..ac1c2de3 100644
--- a/gst/rtp/gstrtpL16pay.h
+++ b/gst/rtp/gstrtpL16pay.h
@@ -1,5 +1,5 @@
/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -17,56 +17,46 @@
* Boston, MA 02111-1307, USA.
*/
-
#ifndef __GST_RTP_L16_PAY_H__
#define __GST_RTP_L16_PAY_H__
#include <gst/gst.h>
+#include <gst/rtp/gstbasertppayload.h>
+#include <gst/base/gstadapter.h>
G_BEGIN_DECLS
-/* Definition of structure storing data for this element. */
+#define GST_TYPE_RTP_L16_PAY \
+ (gst_rtp_L16_pay_get_type())
+#define GST_RTP_L16_PAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_PAY,GstRtpL16Pay))
+#define GST_RTP_L16_PAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_L16_PAY,GstRtpL16PayClass))
+#define GST_IS_RTP_L16_PAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_L16_PAY))
+#define GST_IS_RTP_L16_PAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_L16_PAY))
+
typedef struct _GstRtpL16Pay GstRtpL16Pay;
+typedef struct _GstRtpL16PayClass GstRtpL16PayClass;
+
struct _GstRtpL16Pay
{
- GstElement element;
+ GstBaseRTPPayload payload;
- GstPad *sinkpad;
- GstPad *srcpad;
+ GstAdapter *adapter;
- guint frequency;
- guint channels;
-
- /* the timestamp of the next frame */
- guint64 next_time;
- /* the interval between frames */
- guint64 time_interval;
-
- guint32 ssrc;
- guint16 seq;
+ gint rate;
+ gint channels;
};
-/* Standard definition defining a class for this element. */
-typedef struct _GstRtpL16PayClass GstRtpL16PayClass;
struct _GstRtpL16PayClass
{
- GstElementClass parent_class;
+ GstBaseRTPPayloadClass parent_class;
};
-/* Standard macros for defining types for this element. */
-#define GST_TYPE_RTP_L16_PAY \
- (gst_rtpL16pay_get_type())
-#define GST_RTP_L16_PAY(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_L16_PAY,GstRtpL16Pay))
-#define GST_RTP_L16_PAY_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_L16_PAY,GstRtpL16PayClass))
-#define GST_IS_RTP_L16_PAY(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_L16_PAY))
-#define GST_IS_RTP_L16_PAY_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_L16_PAY))
-
-gboolean gst_rtpL16pay_plugin_init (GstPlugin * plugin);
+gboolean gst_rtp_L16_pay_plugin_init (GstPlugin * plugin);
G_END_DECLS
-#endif /* __GST_RTP_L16_PAY_H__ */
+#endif /* __GST_RTP_L16_PAY_H__ */
generated by cgit (git 2.34.1) at 2024-09-28 08:42:13 +0000