2008-05-13 Wim Taymans <wim.taymans@collabora.co.uk>
+ Based on patch by: Olivier Crete <tester at tester dot ca>
+
+ * gst/rtp/Makefile.am:
+ * gst/rtp/gstrtp.c: (plugin_init):
+ * gst/rtp/gstrtpg729depay.c: (gst_rtp_g729_depay_base_init),
+ (gst_rtp_g729_depay_class_init), (gst_rtp_g729_depay_init),
+ (gst_rtp_g729_depay_setcaps), (gst_rtp_g729_depay_process),
+ (gst_rtp_g729_depay_plugin_init):
+ * gst/rtp/gstrtpg729depay.h:
+ * gst/rtp/gstrtpg729pay.c: (gst_rtpg729pay_base_init),
+ (gst_rtpg729pay_class_init), (gst_rtpg729pay_init),
+ (gst_rtpg729pay_setcaps), (gst_rtp_g729_pay_plugin_init):
+ * gst/rtp/gstrtpg729pay.h:
+ Added G729 pay and depayloaders. Fixes #532409.
+
+2008-05-13 Wim Taymans <wim.taymans@collabora.co.uk>
+
* ext/speex/gstspeexdec.c: (speex_dec_sink_event):
Fix the calculation of the duration of the concealment packets.
gstrtppcmudepay.c \
gstrtppcmupay.c \
gstrtppcmapay.c \
+ gstrtpg729pay.c \
+ gstrtpg729depay.c \
gstrtpgsmdepay.c \
gstrtpgsmpay.c \
gstrtpamrdepay.c \
gstrtppcmudepay.h \
gstrtppcmupay.h \
gstrtppcmapay.h \
+ gstrtpg729depay.h \
+ gstrtpg729pay.h \
gstrtpgsmdepay.h \
gstrtpgsmpay.h \
gstrtpmpadepay.h \
#include "gstrtppcmapay.h"
#include "gstrtppcmadepay.h"
#include "gstrtppcmudepay.h"
+#include "gstrtpg729depay.h"
+#include "gstrtpg729pay.h"
#include "gstrtpgsmpay.h"
#include "gstrtpgsmdepay.h"
#include "gstrtpamrpay.h"
if (!gst_rtp_ilbc_depay_plugin_init (plugin))
return FALSE;
+ if (!gst_rtp_g729_depay_plugin_init (plugin))
+ return FALSE;
+
+ if (!gst_rtp_g729_pay_plugin_init (plugin))
+ return FALSE;
+
if (!gst_rtp_gsm_depay_plugin_init (plugin))
return FALSE;
--- /dev/null
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <gst/rtp/gstrtpbuffer.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include "gstrtpg729depay.h"
+
+/* references:
+ *
+ * RFC 3551 (4.5.6)
+ */
+
+/* elementfactory information */
+static const GstElementDetails gst_rtp_g729depay_details =
+GST_ELEMENT_DETAILS ("RTP packet depayloader",
+ "Codec/Depayloader/Network",
+ "Extracts G729 audio from RTP packets (RFC 3551)",
+ "Laurent Glayal <spglegle@yahoo.fr>");
+
+enum
+{
+ /* FILL ME */
+ LAST_SIGNAL
+};
+
+enum
+{
+ ARG_0
+};
+
+/* input is an RTP packet
+ *
+ */
+static GstStaticPadTemplate gst_rtp_g729_depay_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+ "clock-rate = (int) 8000, "
+ "encoding-name = (string) \"G729\", "
+ "application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) " GST_RTP_PAYLOAD_G729_STRING ", "
+ "clock-rate = (int) 8000")
+ );
+
+static GstStaticPadTemplate gst_rtp_g729_depay_src_template =
+GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("audio/G729, " "channels = (int) 1," "rate = (int) 8000")
+ );
+
+static gboolean gst_rtp_g729_depay_setcaps (GstBaseRTPDepayload * depayload,
+ GstCaps * caps);
+static GstBuffer *gst_rtp_g729_depay_process (GstBaseRTPDepayload * depayload,
+ GstBuffer * buf);
+
+GST_BOILERPLATE (GstRtpG729Depay, gst_rtp_g729_depay, GstBaseRTPDepayload,
+ GST_TYPE_BASE_RTP_DEPAYLOAD);
+
+static void
+gst_rtp_g729_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_g729_depay_src_template));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_rtp_g729_depay_sink_template));
+
+ gst_element_class_set_details (element_class, &gst_rtp_g729depay_details);
+}
+
+static void
+gst_rtp_g729_depay_class_init (GstRtpG729DepayClass * 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);
+
+ gstbasertpdepayload_class->process = gst_rtp_g729_depay_process;
+ gstbasertpdepayload_class->set_caps = gst_rtp_g729_depay_setcaps;
+}
+
+static void
+gst_rtp_g729_depay_init (GstRtpG729Depay * rtpg729depay,
+ GstRtpG729DepayClass * klass)
+{
+ GstBaseRTPDepayload *depayload;
+
+ depayload = GST_BASE_RTP_DEPAYLOAD (rtpg729depay);
+
+ depayload->clock_rate = 8000;
+ gst_pad_use_fixed_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload));
+}
+
+static gboolean
+gst_rtp_g729_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
+{
+ GstStructure *structure;
+ GstCaps *srccaps;
+ GstRtpG729Depay *rtpg729depay;
+ const gchar *params;
+ gint clock_rate, channels;
+ gboolean ret;
+
+ rtpg729depay = GST_RTP_G729_DEPAY (depayload);
+
+ structure = gst_caps_get_structure (caps, 0);
+
+ if (!(params = gst_structure_get_string (structure, "encoding-params")))
+ channels = 1;
+ else {
+ channels = atoi (params);
+ }
+
+ if (!gst_structure_get_int (structure, "clock-rate", &clock_rate))
+ clock_rate = 8000;
+
+ if (channels != 1)
+ goto wrong_channels;
+
+ if (clock_rate != 8000)
+ goto wrong_clock_rate;
+
+ srccaps = gst_caps_new_simple ("audio/G729",
+ "channels", G_TYPE_INT, channels, "rate", G_TYPE_INT, clock_rate, NULL);
+ ret = gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload), srccaps);
+ gst_caps_unref (srccaps);
+
+ rtpg729depay->negotiated = ret;
+
+ return ret;
+
+ /* ERRORS */
+wrong_channels:
+ {
+ GST_DEBUG_OBJECT (rtpg729depay, "expected 1 channel, got %d",
+ rtpg729depay->channels);
+ return FALSE;
+ }
+wrong_clock_rate:
+ {
+ GST_DEBUG_OBJECT (rtpg729depay, "expected 8000 clock-rate, got %d",
+ clock_rate);
+ return FALSE;
+ }
+}
+
+
+static GstBuffer *
+gst_rtp_g729_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
+{
+ GstRtpG729Depay *rtpg729depay;
+ GstBuffer *outbuf = NULL;
+ gint payload_len;
+
+ rtpg729depay = GST_RTP_G729_DEPAY (depayload);
+
+ if (!rtpg729depay->negotiated)
+ goto not_negotiated;
+
+ if (!gst_rtp_buffer_validate (buf)) {
+ GST_ELEMENT_WARNING (rtpg729depay, STREAM, DECODE,
+ (NULL), ("G729 RTP packet did not validate"));
+ goto bad_packet;
+ }
+
+ payload_len = gst_rtp_buffer_get_payload_len (buf);
+
+ /* At least 2 bytes (CNG from G729 Annex B) */
+ if (payload_len < 2) {
+ GST_ELEMENT_WARNING (rtpg729depay, STREAM, DECODE,
+ (NULL), ("G729 RTP payload too small (%d)", payload_len));
+ goto bad_packet;
+ }
+
+ GST_DEBUG_OBJECT (rtpg729depay, "payload len %d", payload_len);
+
+ if ((payload_len % 10) == 2) {
+ GST_DEBUG_OBJECT (rtpg729depay, "G729 payload contains CNG frame");
+ }
+
+ outbuf = gst_rtp_buffer_get_payload_buffer (buf);
+
+ GST_DEBUG ("gst_rtp_g729_depay_chain: pushing buffer of size %d",
+ GST_BUFFER_SIZE (outbuf));
+
+ return outbuf;
+
+ /* ERRORS */
+not_negotiated:
+ {
+ GST_ELEMENT_ERROR (rtpg729depay, STREAM, NOT_IMPLEMENTED,
+ (NULL), ("not negotiated"));
+ return NULL;
+ }
+bad_packet:
+ {
+ /* no fatal error */
+ return NULL;
+ }
+}
+
+gboolean
+gst_rtp_g729_depay_plugin_init (GstPlugin * plugin)
+{
+ return gst_element_register (plugin, "rtpg729depay",
+ GST_RANK_MARGINAL, GST_TYPE_RTP_G729_DEPAY);
+}
--- /dev/null
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_RTP_G729_DEPAY_H__
+#define __GST_RTP_G729_DEPAY_H__
+
+#include <gst/gst.h>
+#include <gst/rtp/gstbasertpdepayload.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTP_G729_DEPAY \
+ (gst_rtp_g729_depay_get_type())
+
+#define GST_RTP_G729_DEPAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_G729_DEPAY,GstRtpG729Depay))
+
+#define GST_RTP_G729_DEPAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_G729_DEPAY,GstRtpG729DepayClass))
+
+#define GST_IS_RTP_G729_DEPAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_G729_DEPAY))
+
+#define GST_IS_RTP_G729_DEPAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_G729_DEPAY))
+
+typedef struct _GstRtpG729Depay GstRtpG729Depay;
+typedef struct _GstRtpG729DepayClass GstRtpG729DepayClass;
+
+struct _GstRtpG729Depay
+{
+ GstBaseRTPDepayload depayload;
+
+ gboolean negotiated;
+
+ gint channels;
+};
+
+struct _GstRtpG729DepayClass
+{
+ GstBaseRTPDepayloadClass parent_class;
+};
+
+gboolean gst_rtp_g729_depay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_RTP_G729_DEPAY_H__ */
--- /dev/null
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstrtpg729pay.h"
+#include <gst/rtp/gstrtpbuffer.h>
+
+/* elementfactory information */
+static GstElementDetails gst_rtpg729pay_details = {
+ "RTP Payloader for G729 Audio",
+ "Codec/Payloader/Network",
+ "Packetize G729 audio streams into RTP packets",
+ "Laurent Glayal <spglegle@yahoo.fr>"
+};
+
+GST_DEBUG_CATEGORY_STATIC (rtpg729pay_debug);
+#define GST_CAT_DEFAULT (rtpg729pay_debug)
+
+static GstStaticPadTemplate gst_rtpg729pay_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("audio/G729, channels=(int)1, rate=(int)8000")
+ );
+
+static GstStaticPadTemplate gst_rtpg729pay_src_template =
+ GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
+ "clock-rate = (int) 8000, " "encoding-name = (string) \"G729\";"
+ "application/x-rtp, "
+ "media = (string) \"audio\", "
+ "payload = (int) " GST_RTP_PAYLOAD_G729_STRING ", "
+ "clock-rate = (int) 8000")
+ );
+
+static gboolean gst_rtpg729pay_setcaps (GstBaseRTPPayload * payload,
+ GstCaps * caps);
+
+GST_BOILERPLATE (GstRtpG729Pay, gst_rtpg729pay, GstBaseRTPAudioPayload,
+ GST_TYPE_BASE_RTP_AUDIO_PAYLOAD);
+
+static void
+gst_rtpg729pay_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_rtpg729pay_sink_template));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_rtpg729pay_src_template));
+ gst_element_class_set_details (element_class, &gst_rtpg729pay_details);
+}
+
+static void
+gst_rtpg729pay_class_init (GstRtpG729PayClass * 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_ref (GST_TYPE_BASE_RTP_PAYLOAD);
+
+ gstbasertppayload_class->set_caps = gst_rtpg729pay_setcaps;
+
+ GST_DEBUG_CATEGORY_INIT (rtpg729pay_debug, "rtpg729pay", 0,
+ "G729 audio RTP payloader");
+}
+
+static void
+gst_rtpg729pay_init (GstRtpG729Pay * rtpg729pay, GstRtpG729PayClass * klass)
+{
+ GstBaseRTPPayload *basertppayload;
+ GstBaseRTPAudioPayload *basertpaudiopayload;
+
+ basertppayload = GST_BASE_RTP_PAYLOAD (rtpg729pay);
+ basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (rtpg729pay);
+
+ /* we don't set the payload type, it should be set by the application using
+ * the pt property or the default 96 will be used */
+ basertppayload->clock_rate = 8000;
+
+ /* tell basertpaudiopayload that this is a frame based codec */
+ gst_base_rtp_audio_payload_set_frame_based (basertpaudiopayload);
+ gst_basertppayload_set_options (basertppayload, "audio", FALSE, "G729", 8000);
+ gst_base_rtp_audio_payload_set_frame_options (basertpaudiopayload, 10, 10);
+}
+
+static gboolean
+gst_rtpg729pay_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps)
+{
+ GstRtpG729Pay *rtpg729pay;
+ GstBaseRTPAudioPayload *basertpaudiopayload;
+ gboolean ret;
+ GstStructure *structure;
+ const char *payload_name;
+
+ rtpg729pay = GST_RTP_G729_PAY (basertppayload);
+ basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (basertppayload);
+
+ structure = gst_caps_get_structure (caps, 0);
+
+ payload_name = gst_structure_get_name (structure);
+ if (g_strcasecmp ("audio/G729", payload_name) != 0)
+ goto wrong_name;
+
+ ret = gst_basertppayload_set_outcaps (basertppayload, NULL);
+
+ return ret;
+
+ /* ERRORS */
+wrong_name:
+ {
+ GST_ERROR_OBJECT (rtpg729pay, "wrong name, expected 'audio/G729', got '%s'",
+ payload_name);
+ return FALSE;
+ }
+}
+
+gboolean
+gst_rtp_g729_pay_plugin_init (GstPlugin * plugin)
+{
+ return gst_element_register (plugin, "rtpg729pay",
+ GST_RANK_NONE, GST_TYPE_RTP_G729_PAY);
+}
--- /dev/null
+/* GStreamer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_RTP_G729_PAY_H__
+#define __GST_RTP_G729_PAY_H__
+
+#include <gst/gst.h>
+#include <gst/rtp/gstbasertpaudiopayload.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTP_G729_PAY \
+ (gst_rtpg729pay_get_type())
+#define GST_RTP_G729_PAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_G729_PAY,GstRtpG729Pay))
+#define GST_RTP_G729_PAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_G729_PAY,GstRtpG729PayClass))
+#define GST_IS_RTP_G729_PAY(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_G729_PAY))
+#define GST_IS_RTP_G729_PAY_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_G729_PAY))
+
+typedef struct _GstRtpG729Pay GstRtpG729Pay;
+typedef struct _GstRtpG729PayClass GstRtpG729PayClass;
+
+struct _GstRtpG729Pay
+{
+ GstBaseRTPAudioPayload audiopayload;
+};
+
+struct _GstRtpG729PayClass
+{
+ GstBaseRTPAudioPayloadClass parent_class;
+};
+
+gboolean gst_rtp_g729_pay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_RTP_G729_PAY_H__ */
projects / platform / upstream / gst-plugins-good.git / commitdiff