Commit f0831787 authored by Wim Taymans's avatar Wim Taymans
Browse files

gst/rtp/: Added simple AC3 depayloader (RFC 4184).

Original commit message from CVS:
* gst/rtp/Makefile.am:
* gst/rtp/gstrtp.c: (plugin_init):
* gst/rtp/gstrtpac3depay.c: (gst_rtp_ac3_depay_base_init),
(gst_rtp_ac3_depay_class_init), (gst_rtp_ac3_depay_init),
(gst_rtp_ac3_depay_setcaps), (gst_rtp_ac3_depay_process),
(gst_rtp_ac3_depay_set_property), (gst_rtp_ac3_depay_get_property),
(gst_rtp_ac3_depay_change_state), (gst_rtp_ac3_depay_plugin_init):
* gst/rtp/gstrtpac3depay.h:
Added simple AC3 depayloader (RFC 4184).
* gst/rtp/gstrtpmp2tdepay.c: (gst_rtp_mp2t_depay_setcaps):
Fix a leak.
parent 54b10ebf
2007-01-24 Wim Taymans <wim@fluendo.com>
* gst/rtp/Makefile.am:
* gst/rtp/gstrtp.c: (plugin_init):
* gst/rtp/gstrtpac3depay.c: (gst_rtp_ac3_depay_base_init),
(gst_rtp_ac3_depay_class_init), (gst_rtp_ac3_depay_init),
(gst_rtp_ac3_depay_setcaps), (gst_rtp_ac3_depay_process),
(gst_rtp_ac3_depay_set_property), (gst_rtp_ac3_depay_get_property),
(gst_rtp_ac3_depay_change_state), (gst_rtp_ac3_depay_plugin_init):
* gst/rtp/gstrtpac3depay.h:
Added simple AC3 depayloader (RFC 4184).
* gst/rtp/gstrtpmp2tdepay.c: (gst_rtp_mp2t_depay_setcaps):
Fix a leak.
2007-01-24 Sebastian Dröge <slomo@circular-chaos.org>
reviewed by: Stefan Kost <ensonic@users.sf.net>
......
......@@ -3,6 +3,7 @@ plugin_LTLIBRARIES = libgstrtp.la
libgstrtp_la_SOURCES = \
gstrtp.c \
gstrtpdepay.c \
gstrtpac3depay.c \
gstrtpilbcdepay.c \
gstrtpilbcpay.c \
gstrtpmpadepay.c \
......@@ -32,7 +33,7 @@ libgstrtp_la_SOURCES = \
gstrtptheoradepay.c \
gstrtptheorapay.c \
gstrtpvorbisdepay.c \
gstrtpvorbispay.c
gstrtpvorbispay.c
#gstrtpL16pay.c gstrtpL16depay.c
......@@ -51,6 +52,7 @@ libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstrtpL16depay.h \
gstrtpL16pay.h \
gstrtpac3depay.h \
gstrtpamrdepay.h \
gstrtpamrpay.h \
gstrtpilbcdepay.h \
......
......@@ -22,6 +22,7 @@
#endif
#include "gstrtpdepay.h"
#include "gstrtpac3depay.h"
#include "gstrtpilbcdepay.h"
#include "gstrtpilbcpay.h"
#include "gstrtppcmupay.h"
......@@ -59,6 +60,9 @@ plugin_init (GstPlugin * plugin)
if (!gst_rtp_depay_plugin_init (plugin))
return FALSE;
if (!gst_rtp_ac3_depay_plugin_init (plugin))
return FALSE;
if (!gst_rtp_ilbc_pay_plugin_init (plugin))
return FALSE;
......
/* GStreamer
* 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
* 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 <string.h>
#include "gstrtpac3depay.h"
GST_DEBUG_CATEGORY_STATIC (rtpac3depay_debug);
#define GST_CAT_DEFAULT (rtpac3depay_debug)
/* elementfactory information */
static const GstElementDetails gst_rtp_ac3depay_details =
GST_ELEMENT_DETAILS ("RTP packet depayloader",
"Codec/Depayloader/Network",
"Extracts AC3 audio from RTP packets (RFC 4184)",
"Wim Taymans <wim@fluendo.com>");
/* RtpAC3Depay signals and args */
enum
{
/* FILL ME */
LAST_SIGNAL
};
enum
{
ARG_0,
};
static GstStaticPadTemplate gst_rtp_ac3_depay_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/ac3")
);
static GstStaticPadTemplate gst_rtp_ac3_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) { 32000, 44100, 48000 }, "
"encoding-name = (string) \"AC3\"")
);
GST_BOILERPLATE (GstRtpAC3Depay, gst_rtp_ac3_depay, GstBaseRTPDepayload,
GST_TYPE_BASE_RTP_DEPAYLOAD);
static gboolean gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload,
GstCaps * caps);
static GstBuffer *gst_rtp_ac3_depay_process (GstBaseRTPDepayload * depayload,
GstBuffer * buf);
static void gst_rtp_ac3_depay_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_rtp_ac3_depay_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static GstStateChangeReturn gst_rtp_ac3_depay_change_state (GstElement *
element, GstStateChange transition);
static void
gst_rtp_ac3_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_ac3_depay_src_template));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_rtp_ac3_depay_sink_template));
gst_element_class_set_details (element_class, &gst_rtp_ac3depay_details);
}
static void
gst_rtp_ac3_depay_class_init (GstRtpAC3DepayClass * 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);
gobject_class->set_property = gst_rtp_ac3_depay_set_property;
gobject_class->get_property = gst_rtp_ac3_depay_get_property;
gstelement_class->change_state = gst_rtp_ac3_depay_change_state;
gstbasertpdepayload_class->set_caps = gst_rtp_ac3_depay_setcaps;
gstbasertpdepayload_class->process = gst_rtp_ac3_depay_process;
GST_DEBUG_CATEGORY_INIT (rtpac3depay_debug, "rtpac3depay", 0,
"MPEG Audio RTP Depayloader");
}
static void
gst_rtp_ac3_depay_init (GstRtpAC3Depay * rtpac3depay,
GstRtpAC3DepayClass * klass)
{
}
static gboolean
gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
{
GstStructure *structure;
GstRtpAC3Depay *rtpac3depay;
gint clock_rate = 90000; /* default */
rtpac3depay = GST_RTP_AC3_DEPAY (depayload);
structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "clock-rate", &clock_rate);
depayload->clock_rate = clock_rate;
return TRUE;
}
struct frmsize_s
{
guint16 bit_rate;
guint16 frm_size[3];
};
static const struct frmsize_s frmsizecod_tbl[] = {
{32, {64, 69, 96}},
{32, {64, 70, 96}},
{40, {80, 87, 120}},
{40, {80, 88, 120}},
{48, {96, 104, 144}},
{48, {96, 105, 144}},
{56, {112, 121, 168}},
{56, {112, 122, 168}},
{64, {128, 139, 192}},
{64, {128, 140, 192}},
{80, {160, 174, 240}},
{80, {160, 175, 240}},
{96, {192, 208, 288}},
{96, {192, 209, 288}},
{112, {224, 243, 336}},
{112, {224, 244, 336}},
{128, {256, 278, 384}},
{128, {256, 279, 384}},
{160, {320, 348, 480}},
{160, {320, 349, 480}},
{192, {384, 417, 576}},
{192, {384, 418, 576}},
{224, {448, 487, 672}},
{224, {448, 488, 672}},
{256, {512, 557, 768}},
{256, {512, 558, 768}},
{320, {640, 696, 960}},
{320, {640, 697, 960}},
{384, {768, 835, 1152}},
{384, {768, 836, 1152}},
{448, {896, 975, 1344}},
{448, {896, 976, 1344}},
{512, {1024, 1114, 1536}},
{512, {1024, 1115, 1536}},
{576, {1152, 1253, 1728}},
{576, {1152, 1254, 1728}},
{640, {1280, 1393, 1920}},
{640, {1280, 1394, 1920}}
};
static GstBuffer *
gst_rtp_ac3_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
{
GstRtpAC3Depay *rtpac3depay;
GstBuffer *outbuf;
rtpac3depay = GST_RTP_AC3_DEPAY (depayload);
if (!gst_rtp_buffer_validate (buf))
goto bad_packet;
{
gint payload_len;
guint8 *payload;
guint16 FT, NF;
payload_len = gst_rtp_buffer_get_payload_len (buf);
payload = gst_rtp_buffer_get_payload (buf);
if (payload_len <= 2)
goto empty_packet;
/* strip off header
*
* 0 1
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
* | MBZ | FT| NF |
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
FT = payload[0] & 0x3;
NF = payload[1];
GST_DEBUG_OBJECT (rtpac3depay, "FT: %d, NF: %d", FT, NF);
payload_len -= 2;
payload += 2;
/* We don't bother with fragmented packets yet */
outbuf = gst_rtp_buffer_get_payload_subbuffer (buf, 2, -1);
GST_DEBUG_OBJECT (rtpac3depay, "pushing buffer of size %d",
GST_BUFFER_SIZE (outbuf));
return outbuf;
}
return NULL;
bad_packet:
{
GST_ELEMENT_WARNING (rtpac3depay, STREAM, DECODE,
("Packet did not validate."), (NULL));
return NULL;
}
#if 0
bad_payload:
{
GST_ELEMENT_WARNING (rtpac3depay, STREAM, DECODE,
("Unexpected payload type."), (NULL));
return NULL;
}
#endif
empty_packet:
{
GST_ELEMENT_WARNING (rtpac3depay, STREAM, DECODE,
("Empty Payload."), (NULL));
return NULL;
}
}
static void
gst_rtp_ac3_depay_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
{
GstRtpAC3Depay *rtpac3depay;
rtpac3depay = GST_RTP_AC3_DEPAY (object);
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_rtp_ac3_depay_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec)
{
GstRtpAC3Depay *rtpac3depay;
rtpac3depay = GST_RTP_AC3_DEPAY (object);
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static GstStateChangeReturn
gst_rtp_ac3_depay_change_state (GstElement * element, GstStateChange transition)
{
GstRtpAC3Depay *rtpac3depay;
GstStateChangeReturn ret;
rtpac3depay = GST_RTP_AC3_DEPAY (element);
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
break;
default:
break;
}
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL:
break;
default:
break;
}
return ret;
}
gboolean
gst_rtp_ac3_depay_plugin_init (GstPlugin * plugin)
{
return gst_element_register (plugin, "rtpac3depay",
GST_RANK_MARGINAL, GST_TYPE_RTP_AC3_DEPAY);
}
/* GStreamer
* 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
* 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_AC3_DEPAY_H__
#define __GST_RTP_AC3_DEPAY_H__
#include <gst/gst.h>
#include <gst/rtp/gstbasertpdepayload.h>
G_BEGIN_DECLS
#define GST_TYPE_RTP_AC3_DEPAY \
(gst_rtp_ac3_depay_get_type())
#define GST_RTP_AC3_DEPAY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_AC3_DEPAY,GstRtpAC3Depay))
#define GST_RTP_AC3_DEPAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_AC3_DEPAY,GstRtpAC3DepayClass))
#define GST_IS_RTP_AC3_DEPAY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_AC3_DEPAY))
#define GST_IS_RTP_AC3_DEPAY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_AC3_DEPAY))
typedef struct _GstRtpAC3Depay GstRtpAC3Depay;
typedef struct _GstRtpAC3DepayClass GstRtpAC3DepayClass;
struct _GstRtpAC3Depay
{
GstBaseRTPDepayload depayload;
};
struct _GstRtpAC3DepayClass
{
GstBaseRTPDepayloadClass parent_class;
};
gboolean gst_rtp_ac3_depay_plugin_init (GstPlugin * plugin);
G_END_DECLS
#endif /* __GST_RTP_AC3_DEPAY_H__ */
......@@ -138,7 +138,6 @@ gst_rtp_mp2t_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
GstStructure *structure;
GstRtpMP2TDepay *rtpmp2tdepay;
GstCaps *srccaps;
gint clock_rate = 90000; /* default */
rtpmp2tdepay = GST_RTP_MP2T_DEPAY (depayload);
......@@ -151,10 +150,6 @@ gst_rtp_mp2t_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
depayload->clock_rate = clock_rate;
srccaps = gst_caps_new_simple ("video/mpegts",
"systemstream", G_TYPE_BOOLEAN, TRUE,
"packetsize", G_TYPE_INT, 188, NULL);
return TRUE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment