From 8f0079c7e2a95b6bf56739dd5cc2634a0cef3205 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 5 Aug 2008 13:54:18 +0000 Subject: [PATCH] gst/rtp/: Add MP1S depayloader. Original commit message from CVS: * gst/rtp/Makefile.am: * gst/rtp/gstrtp.c: (plugin_init): * gst/rtp/gstrtpmp1sdepay.c: (gst_rtp_mp1s_depay_base_init), (gst_rtp_mp1s_depay_class_init), (gst_rtp_mp1s_depay_init), (gst_rtp_mp1s_depay_setcaps), (gst_rtp_mp1s_depay_process), (gst_rtp_mp1s_depay_set_property), (gst_rtp_mp1s_depay_get_property), (gst_rtp_mp1s_depay_change_state), (gst_rtp_mp1s_depay_plugin_init): * gst/rtp/gstrtpmp1sdepay.h: Add MP1S depayloader. * gst/rtsp/URLS: Some more sample rtsp streams. --- ChangeLog | 17 +++ gst/rtp/Makefile.am | 2 + gst/rtp/gstrtp.c | 4 + gst/rtp/gstrtpmp1sdepay.c | 248 ++++++++++++++++++++++++++++++++++++++ gst/rtp/gstrtpmp1sdepay.h | 56 +++++++++ gst/rtsp/URLS | 3 + 6 files changed, 330 insertions(+) create mode 100644 gst/rtp/gstrtpmp1sdepay.c create mode 100644 gst/rtp/gstrtpmp1sdepay.h diff --git a/ChangeLog b/ChangeLog index d1acc0b611..d9158f5e99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2008-08-05 Wim Taymans + + * gst/rtp/Makefile.am: + * gst/rtp/gstrtp.c: (plugin_init): + * gst/rtp/gstrtpmp1sdepay.c: (gst_rtp_mp1s_depay_base_init), + (gst_rtp_mp1s_depay_class_init), (gst_rtp_mp1s_depay_init), + (gst_rtp_mp1s_depay_setcaps), (gst_rtp_mp1s_depay_process), + (gst_rtp_mp1s_depay_set_property), + (gst_rtp_mp1s_depay_get_property), + (gst_rtp_mp1s_depay_change_state), + (gst_rtp_mp1s_depay_plugin_init): + * gst/rtp/gstrtpmp1sdepay.h: + Add MP1S depayloader. + + * gst/rtsp/URLS: + Some more sample rtsp streams. + 2008-08-05 Wim Taymans * gst/rtsp/URLS: diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index 78045b8089..e72b0eb31e 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -34,6 +34,7 @@ libgstrtp_la_SOURCES = \ gstrtpL16depay.c \ gstrtpL16pay.c \ gstasteriskh263.c \ + gstrtpmp1sdepay.c \ gstrtpmp2tdepay.c \ gstrtpmp2tpay.c \ gstrtpmp4vdepay.c \ @@ -95,6 +96,7 @@ noinst_HEADERS = \ gstrtph263pay.h \ gstrtph264depay.h \ gstrtph264pay.h \ + gstrtpmp1sdepay.h \ gstrtpmp2tdepay.h \ gstrtpmp2tpay.h \ gstrtpmp4vdepay.h \ diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index 5025a05bf8..61ce785126 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -52,6 +52,7 @@ #include "gstrtpL16depay.h" #include "gstrtpL16pay.h" #include "gstasteriskh263.h" +#include "gstrtpmp1sdepay.h" #include "gstrtpmp2tdepay.h" #include "gstrtpmp2tpay.h" #include "gstrtpmp4vdepay.h" @@ -165,6 +166,9 @@ plugin_init (GstPlugin * plugin) if (!gst_asteriskh263_plugin_init (plugin)) return FALSE; + if (!gst_rtp_mp1s_depay_plugin_init (plugin)) + return FALSE; + if (!gst_rtp_mp2t_depay_plugin_init (plugin)) return FALSE; diff --git a/gst/rtp/gstrtpmp1sdepay.c b/gst/rtp/gstrtpmp1sdepay.c new file mode 100644 index 0000000000..5c520d6508 --- /dev/null +++ b/gst/rtp/gstrtpmp1sdepay.c @@ -0,0 +1,248 @@ +/* GStreamer + * Copyright (C) <2008> 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 "gstrtpmp1sdepay.h" + +/* elementfactory information */ +static const GstElementDetails gst_rtp_mp1sdepay_details = +GST_ELEMENT_DETAILS ("RTP packet depayloader", + "Codec/Depayloader/Network", + "Extracts MPEG1 System Streams from RTP packets (RFC 3555)", + "Wim Taymans "); + +/* RtpMP1SDepay signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + PROP_0, + PROP_LAST +}; + +static GstStaticPadTemplate gst_rtp_mp1s_depay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg,systemstream=(boolean)true") + ); + +/* The spec says video/MP1S but I have seen streams with other/MP1S so we will + * allow them both */ +static GstStaticPadTemplate gst_rtp_mp1s_depay_sink_template = + GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"other\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP1S\";" + "application/x-rtp, " + "media = (string) \"video\", " + "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " + "clock-rate = (int) [1, MAX ], " "encoding-name = (string) \"MP1S\"") + ); + +GST_BOILERPLATE (GstRtpMP1SDepay, gst_rtp_mp1s_depay, GstBaseRTPDepayload, + GST_TYPE_BASE_RTP_DEPAYLOAD); + +static gboolean gst_rtp_mp1s_depay_setcaps (GstBaseRTPDepayload * depayload, + GstCaps * caps); +static GstBuffer *gst_rtp_mp1s_depay_process (GstBaseRTPDepayload * depayload, + GstBuffer * buf); + +static void gst_rtp_mp1s_depay_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtp_mp1s_depay_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtp_mp1s_depay_change_state (GstElement * + element, GstStateChange transition); + + +static void +gst_rtp_mp1s_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_mp1s_depay_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_mp1s_depay_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_mp1sdepay_details); +} + +static void +gst_rtp_mp1s_depay_class_init (GstRtpMP1SDepayClass * 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_mp1s_depay_process; + gstbasertpdepayload_class->set_caps = gst_rtp_mp1s_depay_setcaps; + + gobject_class->set_property = gst_rtp_mp1s_depay_set_property; + gobject_class->get_property = gst_rtp_mp1s_depay_get_property; + + gstelement_class->change_state = gst_rtp_mp1s_depay_change_state; +} + +static void +gst_rtp_mp1s_depay_init (GstRtpMP1SDepay * rtpmp1sdepay, + GstRtpMP1SDepayClass * klass) +{ +} + +static gboolean +gst_rtp_mp1s_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps) +{ + GstCaps *srccaps; + GstStructure *structure; + GstRtpMP1SDepay *rtpmp1sdepay; + gint clock_rate = 90000; /* default */ + + rtpmp1sdepay = GST_RTP_MP1S_DEPAY (depayload); + + structure = gst_caps_get_structure (caps, 0); + gst_structure_get_int (structure, "clock-rate", &clock_rate); + depayload->clock_rate = clock_rate; + + srccaps = gst_caps_new_simple ("video/mpeg", + "systemstream", G_TYPE_BOOLEAN, TRUE, NULL); + gst_pad_set_caps (GST_BASE_RTP_DEPAYLOAD_SRCPAD (depayload), srccaps); + gst_caps_unref (srccaps); + + return TRUE; +} + +static GstBuffer * +gst_rtp_mp1s_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) +{ + GstRtpMP1SDepay *rtpmp1sdepay; + GstBuffer *outbuf; + gint payload_len; + + rtpmp1sdepay = GST_RTP_MP1S_DEPAY (depayload); + + if (G_UNLIKELY (!gst_rtp_buffer_validate (buf))) + goto bad_packet; + + payload_len = gst_rtp_buffer_get_payload_len (buf); + + outbuf = gst_rtp_buffer_get_payload_subbuffer (buf, 0, -1); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (depayload->srcpad)); + + GST_DEBUG ("gst_rtp_mp1s_depay_chain: pushing buffer of size %d", + GST_BUFFER_SIZE (outbuf)); + + return outbuf; + + /* ERRORS */ +bad_packet: + { + GST_ELEMENT_WARNING (rtpmp1sdepay, STREAM, DECODE, + (NULL), ("Packet did not validate")); + return NULL; + } +} + +static void +gst_rtp_mp1s_depay_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpMP1SDepay *rtpmp1sdepay; + + rtpmp1sdepay = GST_RTP_MP1S_DEPAY (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtp_mp1s_depay_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstRtpMP1SDepay *rtpmp1sdepay; + + rtpmp1sdepay = GST_RTP_MP1S_DEPAY (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtp_mp1s_depay_change_state (GstElement * element, + GstStateChange transition) +{ + GstRtpMP1SDepay *rtpmp1sdepay; + GstStateChangeReturn ret; + + rtpmp1sdepay = GST_RTP_MP1S_DEPAY (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + 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_mp1s_depay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmp1sdepay", + GST_RANK_MARGINAL, GST_TYPE_RTP_MP1S_DEPAY); +} diff --git a/gst/rtp/gstrtpmp1sdepay.h b/gst/rtp/gstrtpmp1sdepay.h new file mode 100644 index 0000000000..a0b827846a --- /dev/null +++ b/gst/rtp/gstrtpmp1sdepay.h @@ -0,0 +1,56 @@ +/* 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_MP1S_DEPAY_H__ +#define __GST_RTP_MP1S_DEPAY_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_MP1S_DEPAY \ + (gst_rtp_mp1s_depay_get_type()) +#define GST_RTP_MP1S_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP1S_DEPAY,GstRtpMP1SDepay)) +#define GST_RTP_MP1S_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP1S_DEPAY,GstRtpMP1SDepayClass)) +#define GST_IS_RTP_MP1S_DEPAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP1S_DEPAY)) +#define GST_IS_RTP_MP1S_DEPAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP1S_DEPAY)) +typedef struct _GstRtpMP1SDepay GstRtpMP1SDepay; +typedef struct _GstRtpMP1SDepayClass GstRtpMP1SDepayClass; + +struct _GstRtpMP1SDepay +{ + GstBaseRTPDepayload depayload; +}; + +struct _GstRtpMP1SDepayClass +{ + GstBaseRTPDepayloadClass parent_class; +}; + +gboolean gst_rtp_mp1s_depay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MP1S_DEPAY_H__ */ diff --git a/gst/rtsp/URLS b/gst/rtsp/URLS index fe7f37a12c..26b40085e1 100644 --- a/gst/rtsp/URLS +++ b/gst/rtsp/URLS @@ -33,3 +33,6 @@ REAL: AAC, interleaved: rtsp://ia300135.us.archive.org:554/0/items/uncovered_interviews/uncovered_interviews_3_256kb.mp4 + +Various samples here: + http://www.jet-stream.nl/samples/mp4.html