From ffed349b0b7e8473bc4638a0ac8ec59d085ae521 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 16 Aug 2006 10:05:00 +0000 Subject: [PATCH] gst/rtp/: Caps extra properties must be defined as strings for depayloaders because they are generated from an SDP. Original commit message from CVS: * gst/rtp/gstrtpamrdepay.c: * gst/rtp/gstrtpmp4gdepay.c: Caps extra properties must be defined as strings for depayloaders because they are generated from an SDP. * gst/rtp/Makefile.am: * gst/rtp/gstrtp.c: (plugin_init): * gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_base_init), (gst_rtp_h264_depay_class_init), (gst_rtp_h264_depay_init), (gst_rtp_h264_depay_finalize), (decode_base64), (gst_rtp_h264_depay_setcaps), (gst_rtp_h264_depay_process), (gst_rtp_h264_depay_set_property), (gst_rtp_h264_depay_get_property), (gst_rtp_h264_depay_change_state), (gst_rtp_h264_depay_plugin_init): * gst/rtp/gstrtph264depay.h: Added basic, not completely functional RFC 3984 H264 depayloader. --- ChangeLog | 20 ++ gst/rtp/Makefile.am | 2 + gst/rtp/gstrtp.c | 4 + gst/rtp/gstrtpamrdepay.c | 2 + gst/rtp/gstrtph264depay.c | 495 ++++++++++++++++++++++++++++++++++++++ gst/rtp/gstrtph264depay.h | 61 +++++ gst/rtp/gstrtpmp4gdepay.c | 31 +-- 7 files changed, 600 insertions(+), 15 deletions(-) create mode 100644 gst/rtp/gstrtph264depay.c create mode 100644 gst/rtp/gstrtph264depay.h diff --git a/ChangeLog b/ChangeLog index 960a4df651..37ad15d4b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2006-08-16 Wim Taymans + + * gst/rtp/gstrtpamrdepay.c: + * gst/rtp/gstrtpmp4gdepay.c: + Caps extra properties must be defined as strings for + depayloaders because they are generated from an SDP. + + * gst/rtp/Makefile.am: + * gst/rtp/gstrtp.c: (plugin_init): + * gst/rtp/gstrtph264depay.c: (gst_rtp_h264_depay_base_init), + (gst_rtp_h264_depay_class_init), (gst_rtp_h264_depay_init), + (gst_rtp_h264_depay_finalize), (decode_base64), + (gst_rtp_h264_depay_setcaps), (gst_rtp_h264_depay_process), + (gst_rtp_h264_depay_set_property), + (gst_rtp_h264_depay_get_property), + (gst_rtp_h264_depay_change_state), + (gst_rtp_h264_depay_plugin_init): + * gst/rtp/gstrtph264depay.h: + Added basic, not completely functional RFC 3984 H264 depayloader. + 2006-08-16 Wim Taymans * gst/rtsp/gstrtpdec.c: (gst_rtpdec_init), (gst_rtpdec_getcaps): diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index 17b6edd924..4f5157c917 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -16,6 +16,7 @@ libgstrtp_la_SOURCES = \ gstrtph263pdepay.c \ gstrtph263ppay.c \ gstrtph263pay.c \ + gstrtph264depay.c \ gstasteriskh263.c \ gstrtpmp2tdepay.c \ gstrtpmp4vdepay.c \ @@ -54,6 +55,7 @@ noinst_HEADERS = \ gstrtph263pdepay.h \ gstrtph263ppay.h \ gstrtph263pay.h \ + gstrtph264depay.h \ gstrtpmp2tdepay.h \ gstrtpmp4vdepay.h \ gstrtpmp4vpay.h \ diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index 865694a27e..d1eb210e61 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -35,6 +35,7 @@ #include "gstrtph263pdepay.h" #include "gstrtph263ppay.h" #include "gstrtph263pay.h" +#include "gstrtph264depay.h" #include "gstasteriskh263.h" #include "gstrtpmp2tdepay.h" #include "gstrtpmp4vdepay.h" @@ -89,6 +90,9 @@ plugin_init (GstPlugin * plugin) if (!gst_rtp_h263_pay_plugin_init (plugin)) return FALSE; + if (!gst_rtp_h264_depay_plugin_init (plugin)) + return FALSE; + if (!gst_asteriskh263_plugin_init (plugin)) return FALSE; diff --git a/gst/rtp/gstrtpamrdepay.c b/gst/rtp/gstrtpamrdepay.c index 5b0e4b35e4..a07aa8ae2b 100644 --- a/gst/rtp/gstrtpamrdepay.c +++ b/gst/rtp/gstrtpamrdepay.c @@ -65,6 +65,8 @@ GST_STATIC_PAD_TEMPLATE ("sink", "clock-rate = (int) 8000, " "encoding-name = (string) \"AMR\", " "encoding-params = (string) \"1\", " + /* NOTE that all values must be strings in orde to be able to do SDP <-> + * GstCaps mapping. */ "octet-align = (string) \"1\", " "crc = (string) { \"0\", \"1\" }, " "robust-sorting = (string) \"0\", " "interleaving = (string) \"0\"" diff --git a/gst/rtp/gstrtph264depay.c b/gst/rtp/gstrtph264depay.c new file mode 100644 index 0000000000..ce361e25ca --- /dev/null +++ b/gst/rtp/gstrtph264depay.c @@ -0,0 +1,495 @@ +/* GStreamer + * Copyright (C) <2006> Wim Taymans + * + * 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 + +#include +#include "gstrtph264depay.h" + +/* elementfactory information */ +static const GstElementDetails gst_rtp_h264depay_details = +GST_ELEMENT_DETAILS ("RTP packet parser", + "Codec/Depayr/Network", + "Extracts H264 video from RTP packets (RFC 3984)", + "Wim Taymans "); + +/* RtpH264Depay signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_FREQUENCY +}; + +static GstStaticPadTemplate gst_rtp_h264_depay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/x-h264") + ); + +static GstStaticPadTemplate gst_rtp_h264_depay_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"video\", " + "clock-rate = (int) 90000, " "encoding-name = (string) \"H264\"") + /** optional parameters **/ + /* "profile-level-id = (string) ANY, " */ + /* "max-mbps = (string) ANY, " */ + /* "max-fs = (string) ANY, " */ + /* "max-cpb = (string) ANY, " */ + /* "max-dpb = (string) ANY, " */ + /* "max-br = (string) ANY, " */ + /* "redundant-pic-cap = (string) { \"0\", \"1\" }, " */ + /* "sprop-parameter-sets = (string) ANY, " */ + /* "parameter-add = (string) { \"0\", \"1\" }, " */ + /* "packetization-mode = (string) { \"0\", \"1\", \"2\" }, " */ + /* "sprop-interleaving-depth = (string) ANY, " */ + /* "sprop-deint-buf-req = (string) ANY, " */ + /* "deint-buf-cap = (string) ANY, " */ + /* "sprop-init-buf-time = (string) ANY, " */ + /* "sprop-max-don-diff = (string) ANY, " */ + /* "max-rcmd-nalu-size = (string) ANY " */ + ); + +GST_BOILERPLATE (GstRtpH264Depay, gst_rtp_h264_depay, GstBaseRTPDepayload, + GST_TYPE_BASE_RTP_DEPAYLOAD); + +static void gst_rtp_h264_depay_finalize (GObject * object); +static void gst_rtp_h264_depay_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtp_h264_depay_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtp_h264_depay_change_state (GstElement * + element, GstStateChange transition); + +static GstBuffer *gst_rtp_h264_depay_process (GstBaseRTPDepayload * depayload, + GstBuffer * buf); +static gboolean gst_rtp_h264_depay_setcaps (GstBaseRTPDepayload * filter, + GstCaps * caps); + +static void +gst_rtp_h264_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_h264_depay_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_h264_depay_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_h264depay_details); +} + +static void +gst_rtp_h264_depay_class_init (GstRtpH264DepayClass * 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_h264_depay_process; + gstbasertpdepayload_class->set_caps = gst_rtp_h264_depay_setcaps; + + gobject_class->finalize = gst_rtp_h264_depay_finalize; + + gobject_class->set_property = gst_rtp_h264_depay_set_property; + gobject_class->get_property = gst_rtp_h264_depay_get_property; + + gstelement_class->change_state = gst_rtp_h264_depay_change_state; +} + +static void +gst_rtp_h264_depay_init (GstRtpH264Depay * rtph264depay, + GstRtpH264DepayClass * klass) +{ + rtph264depay->adapter = gst_adapter_new (); +} + +static void +gst_rtp_h264_depay_finalize (GObject * object) +{ + GstRtpH264Depay *rtph264depay; + + rtph264depay = GST_RTP_H264_DEPAY (object); + + g_object_unref (rtph264depay->adapter); + rtph264depay->adapter = NULL; + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static const guint8 a2bin[256] = { + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64, + 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64, + 64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 +}; + +static guint +decode_base64 (gchar * in, guint8 * out) +{ + guint8 v1, v2; + guint len = 0; + + v1 = a2bin[(gint) * in]; + while (v1 < 63) { + /* read 4 bytes, write 3 bytes, invalid base64 are zeroes */ + v2 = a2bin[(gint) * ++in]; + *out++ = (v1 << 2) | ((v2 & 0x3f) >> 4); + v1 = (v2 > 63 ? 64 : a2bin[(gint) * ++in]); + *out++ = (v2 << 4) | ((v1 & 0x3f) >> 2); + v2 = (v1 > 63 ? 64 : a2bin[(gint) * ++in]); + *out++ = (v1 << 6) | (v2 & 0x3f); + v1 = (v2 > 63 ? 64 : a2bin[(gint) * ++in]); + len += 3; + } + /* move to '\0' */ + while (*in != '\0') + in++; + + /* subtract padding */ + while (len > 0 && *--in == '=') + len--; + + return len; +} + +static gboolean +gst_rtp_h264_depay_setcaps (GstBaseRTPDepayload * filter, GstCaps * caps) +{ + GstCaps *srccaps = NULL; + gint clock_rate = 90000; + GstStructure *structure = gst_caps_get_structure (caps, 0); + + if (gst_structure_has_field (structure, "clock-rate")) { + gst_structure_get_int (structure, "clock-rate", &clock_rate); + } + + srccaps = gst_caps_new_simple ("video/x-h264", NULL); + + if (gst_structure_has_field (structure, "sprop-parameter-sets")) { + const gchar *ps; + gchar **params; + guint len, total; + gint i; + GstBuffer *codec_data; + guint8 *b64; + + /* Base64 encoded, comma separated config NALs */ + ps = gst_structure_get_string (structure, "sprop-parameter-sets"); + params = g_strsplit (ps, ",", 0); + + /* count total number of bytes in base64 */ + len = 0; + for (i = 0; params[i]; i++) { + len += strlen (params[i]); + } + /* we seriously overshoot the length, but it's fine. */ + codec_data = gst_buffer_new_and_alloc (len); + b64 = GST_BUFFER_DATA (codec_data); + + total = 0; + for (i = 0; params[i]; i++) { + *b64++ = 0; + *b64++ = 0; + *b64++ = 1; + len = decode_base64 (params[i], b64); + total += (len + 3); + b64 += len; + } + GST_BUFFER_SIZE (codec_data) = total; + + gst_caps_set_simple (srccaps, + "codec_data", GST_TYPE_BUFFER, codec_data, NULL); + } + + filter->clock_rate = clock_rate; + + gst_pad_set_caps (filter->srcpad, srccaps); + gst_caps_unref (srccaps); + + return TRUE; +} + +static GstBuffer * +gst_rtp_h264_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) +{ + + GstRtpH264Depay *rtph264depay; + GstBuffer *outbuf; + + rtph264depay = GST_RTP_H264_DEPAY (depayload); + + if (!gst_rtp_buffer_validate (buf)) + goto bad_packet; + + { + gint payload_len; + guint8 *payload; + guint header_len; + guint8 nal_ref_idc, nal_unit_type; + + payload_len = gst_rtp_buffer_get_payload_len (buf); + payload = gst_rtp_buffer_get_payload (buf); + + /* +---------------+ + * |0|1|2|3|4|5|6|7| + * +-+-+-+-+-+-+-+-+ + * |F|NRI| Type | + * +---------------+ + * + * F must be 0. + */ + nal_ref_idc = (payload[0] & 0x60) >> 5; + nal_unit_type = payload[0] & 0x1f; + + GST_DEBUG_OBJECT (rtph264depay, "NRI %d, Type %d", nal_ref_idc, + nal_unit_type); + + switch (nal_unit_type) { + case 0: + case 30: + case 31: + /* undefined */ + goto undefined_type; + case 24: + /* STAP-A Single-time aggregation packet 5.7.1 */ + header_len = 1; + break; + case 25: + /* STAP-B Single-time aggregation packet 5.7.1 */ + case 26: + /* MTAP16 Multi-time aggregation packet 5.7.2 */ + case 27: + /* MTAP24 Multi-time aggregation packet 5.7.2 */ + header_len = 3; + break; + case 28: + case 29: + { + /* FU-A Fragmentation unit 5.8 */ + /* FU-B Fragmentation unit 5.8 */ + gboolean S, E; + + /* +---------------+ + * |0|1|2|3|4|5|6|7| + * +-+-+-+-+-+-+-+-+ + * |S|E|R| Type | + * +---------------+ + * + * R is reserved and always 0 + */ + S = (payload[1] & 0x80) == 0x80; + E = (payload[1] & 0x40) == 0x40; + + GST_DEBUG_OBJECT (rtph264depay, "S %d, E %d", S, E); + + if (S) { + /* NAL unit starts here */ + guint8 *outdata; + guint outsize; + + outsize = payload_len - 1; + + outbuf = gst_buffer_new_and_alloc (outsize + 3); + outdata = GST_BUFFER_DATA (outbuf); + memcpy (outdata + 3, payload + 1, outsize); + /* reconstruct NAL header */ + outdata[0] = 0x00; + outdata[1] = 0x00; + outdata[2] = 0x01; + outdata[3] = (payload[0] & 0xe0) | (payload[1] & 0x1f); + + /* and assemble in the adapter */ + gst_adapter_push (rtph264depay->adapter, outbuf); + } else { + /* NAL unit data */ + guint outsize; + guint8 *outdata; + + /* strip off 2 header bytes */ + outsize = payload_len - 2; + + outbuf = gst_buffer_new_and_alloc (outsize); + outdata = GST_BUFFER_DATA (outbuf); + memcpy (outdata, payload + 2, outsize); + + /* and assemble in the adapter */ + gst_adapter_push (rtph264depay->adapter, outbuf); + } + + /* if NAL unit ends, flush the adapter */ + if (E) { + guint outsize; + guint8 *outdata; + + outsize = gst_adapter_available (rtph264depay->adapter); + outdata = gst_adapter_take (rtph264depay->adapter, outsize); + + outbuf = gst_buffer_new (); + GST_BUFFER_SIZE (outbuf) = outsize; + GST_BUFFER_DATA (outbuf) = outdata; + GST_BUFFER_MALLOCDATA (outbuf) = outdata; + + gst_buffer_set_caps (outbuf, + (GstCaps *) gst_pad_get_pad_template_caps (depayload->srcpad)); + + GST_DEBUG_OBJECT (rtph264depay, "output %d bytes", outsize); + + return outbuf; + } + break; + } + default: + { + guint outsize; + guint8 *outdata; + + /* 1-23 NAL unit Single NAL unit packet per H.264 5.6 */ + /* the entire payload is the output buffer */ + outsize = payload_len + 3; + outbuf = gst_buffer_new_and_alloc (outsize); + outdata = GST_BUFFER_DATA (outbuf); + outdata[0] = 0; + outdata[1] = 0; + outdata[2] = 1; + memcpy (&outdata[3], payload, payload_len); + + gst_buffer_set_caps (outbuf, + (GstCaps *) gst_pad_get_pad_template_caps (depayload->srcpad)); + + return outbuf; + } + } + } + + return NULL; + + /* ERRORS */ +bad_packet: + { + GST_ELEMENT_WARNING (rtph264depay, STREAM, DECODE, + ("Packet did not validate"), (NULL)); + return NULL; + } +undefined_type: + { + GST_ELEMENT_WARNING (rtph264depay, STREAM, DECODE, + ("Undefined packet type"), (NULL)); + return NULL; + } +} + +static void +gst_rtp_h264_depay_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpH264Depay *rtph264depay; + + rtph264depay = GST_RTP_H264_DEPAY (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtp_h264_depay_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstRtpH264Depay *rtph264depay; + + rtph264depay = GST_RTP_H264_DEPAY (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtp_h264_depay_change_state (GstElement * element, + GstStateChange transition) +{ + GstRtpH264Depay *rtph264depay; + GstStateChangeReturn ret; + + rtph264depay = GST_RTP_H264_DEPAY (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + gst_adapter_clear (rtph264depay->adapter); + 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_h264_depay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtph264depay", + GST_RANK_NONE, GST_TYPE_RTP_H264_DEPAY); +} diff --git a/gst/rtp/gstrtph264depay.h b/gst/rtp/gstrtph264depay.h new file mode 100644 index 0000000000..2325938182 --- /dev/null +++ b/gst/rtp/gstrtph264depay.h @@ -0,0 +1,61 @@ +/* GStreamer + * Copyright (C) <2006> Wim Taymans + * + * 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_H264_DEPAY_H__ +#define __GST_RTP_H264_DEPAY_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_H264_DEPAY \ + (gst_rtp_h264_depay_get_type()) +#define GST_RTP_H264_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_H264_DEPAY,GstRtpH264Depay)) +#define GST_RTP_H264_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_H264_DEPAY,GstRtpH264DepayClass)) +#define GST_IS_RTP_H264_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_H264_DEPAY)) +#define GST_IS_RTP_H264_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_H264_DEPAY)) + +typedef struct _GstRtpH264Depay GstRtpH264Depay; +typedef struct _GstRtpH264DepayClass GstRtpH264DepayClass; + +struct _GstRtpH264Depay +{ + GstBaseRTPDepayload depayload; + + GstAdapter *adapter; + + guint frequency; +}; + +struct _GstRtpH264DepayClass +{ + GstBaseRTPDepayloadClass parent_class; +}; + +gboolean gst_rtp_h264_depay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_H264_DEPAY_H__ */ diff --git a/gst/rtp/gstrtpmp4gdepay.c b/gst/rtp/gstrtpmp4gdepay.c index 3a6e3c9ca4..4ff385fe56 100644 --- a/gst/rtp/gstrtpmp4gdepay.c +++ b/gst/rtp/gstrtpmp4gdepay.c @@ -68,24 +68,25 @@ GST_STATIC_PAD_TEMPLATE ("sink", "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"mpeg4-generic\", " /* required string params */ - "streamtype = (int) { \"4\", \"5\" }, " /* 4 = video, 5 = audio */ - "profile-level-id = (int) [1,MAX], " + "streamtype = (string) { \"4\", \"5\" }, " /* 4 = video, 5 = audio */ + /* "profile-level-id = (string) [1,MAX], " */ /* "config = (string) [1,MAX]" */ - "mode = (string) { \"generic\", \"CELP-cbr\", \"CELP-vbr\", \"AAC-lbr\", \"AAC-hbr\" }, " + "mode = (string) { \"generic\", \"CELP-cbr\", \"CELP-vbr\", \"AAC-lbr\", \"AAC-hbr\" } " /* Optional general parameters */ - "objecttype = (int) [1,MAX], " "constantsize = (int) [1,MAX], " /* constant size of each AU */ - "constantduration = (int) [1,MAX], " /* constant duration of each AU */ - "maxdisplacement = (int) [1,MAX], " - "de-interleavebuffersize = (int) [1,MAX], " + /* "objecttype = (string) [1,MAX], " */ + /* "constantsize = (string) [1,MAX], " *//* constant size of each AU */ + /* "constantduration = (string) [1,MAX], " *//* constant duration of each AU */ + /* "maxdisplacement = (string) [1,MAX], " */ + /* "de-interleavebuffersize = (string) [1,MAX], " */ /* Optional configuration parameters */ - "sizelength = (int) [1, 16], " /* max 16 bits, should be enough... */ - "indexlength = (int) [1, 8], " - "indexdeltalength = (int) [1, 8], " - "ctsdeltalength = (int) [1, 64], " - "dtsdeltalength = (int) [1, 64], " - "randomaccessindication = (int) {0, 1}, " - "streamstateindication = (int) [0, 64], " - "auxiliarydatasizelength = (int) [0, 64]") + /* "sizelength = (string) [1, 16], " *//* max 16 bits, should be enough... */ + /* "indexlength = (string) [1, 8], " */ + /* "indexdeltalength = (string) [1, 8], " */ + /* "ctsdeltalength = (string) [1, 64], " */ + /* "dtsdeltalength = (string) [1, 64], " */ + /* "randomaccessindication = (string) {0, 1}, " */ + /* "streamstateindication = (string) [0, 64], " */ + /* "auxiliarydatasizelength = (string) [0, 64]" */ ) ); GST_BOILERPLATE (GstRtpMP4GDepay, gst_rtp_mp4g_depay, GstBaseRTPDepayload,