diff --git a/ChangeLog b/ChangeLog index e489315096..fd27262879 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2005-09-06 Wim Taymans + + * gst/rtp/Makefile.am: + * gst/rtp/gstrtp.c: (plugin_init): + * gst/rtp/gstrtpmp4vdec.c: (gst_rtpmp4vdec_get_type), + (gst_rtpmp4vdec_base_init), (gst_rtpmp4vdec_class_init), + (gst_rtpmp4vdec_init), (gst_rtpmp4vdec_setcaps), + (gst_rtpmp4vdec_chain), (gst_rtpmp4vdec_set_property), + (gst_rtpmp4vdec_get_property), (gst_rtpmp4vdec_change_state), + (gst_rtpmp4vdec_plugin_init): + * gst/rtp/gstrtpmp4vdec.h: + * gst/rtp/gstrtpmp4venc.c: (gst_rtpmp4venc_get_type), + (gst_rtpmp4venc_base_init), (gst_rtpmp4venc_class_init), + (gst_rtpmp4venc_init), (gst_rtpmp4venc_setcaps), + (gst_rtpmp4venc_flush), (gst_rtpmp4venc_chain), + (gst_rtpmp4venc_set_property), (gst_rtpmp4venc_get_property), + (gst_rtpmp4venc_change_state), (gst_rtpmp4venc_plugin_init): + * gst/rtp/gstrtpmp4venc.h: + * gst/rtp/gstrtpmpadec.c: (gst_rtpmpadec_chain): + * gst/rtp/gstrtpmpaenc.c: (gst_rtpmpaenc_flush): + Added mpeg4 video payload encoder/decoder. + Added some docs in mpa payloader. + === release 0.9.1 === 2005-09-06 Thomas Vander Stichele diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index 40b575e6a6..073e1145e4 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -7,7 +7,9 @@ libgstrtp_la_SOURCES = gstrtp.c \ gstrtpamrdec.c \ gstrtpamrenc.c \ gstrtph263pdec.c \ - gstrtph263penc.c + gstrtph263penc.c \ + gstrtpmp4venc.c \ + gstrtpmp4vdec.c #gstrtpL16enc.c gstrtpL16parse.c gstrtpgsmenc.c gstrtpgsmparse.c @@ -26,4 +28,6 @@ noinst_HEADERS = gstrtpL16enc.h \ gstrtpmpaenc.h \ gstrtph263pdec.h \ gstrtph263penc.h \ + gstrtpmp4venc.h \ + gstrtpmp4vdec.h \ gstrtpdec.h diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index 02205d2362..d571b11997 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -28,6 +28,8 @@ #include "gstrtpmpadec.h" #include "gstrtph263pdec.h" #include "gstrtph263penc.h" +#include "gstrtpmp4venc.h" +#include "gstrtpmp4vdec.h" static gboolean plugin_init (GstPlugin * plugin) @@ -53,6 +55,12 @@ plugin_init (GstPlugin * plugin) if (!gst_rtph263pdec_plugin_init (plugin)) return FALSE; + if (!gst_rtpmp4venc_plugin_init (plugin)) + return FALSE; + + if (!gst_rtpmp4vdec_plugin_init (plugin)) + return FALSE; + return TRUE; } diff --git a/gst/rtp/gstrtpmp4vdec.c b/gst/rtp/gstrtpmp4vdec.c new file mode 100644 index 0000000000..39ab5df955 --- /dev/null +++ b/gst/rtp/gstrtpmp4vdec.c @@ -0,0 +1,309 @@ +/* GStreamer + * Copyright (C) <2005> 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 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include "gstrtpmp4vdec.h" + +/* elementfactory information */ +static GstElementDetails gst_rtp_mp4vdec_details = { + "RTP packet parser", + "Codec/Parser/Network", + "Extracts MPEG4 video from RTP packets (RFC 3016)", + "Wim Taymans " +}; + +/* RtpMP4VDec signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_FREQUENCY +}; + +static GstStaticPadTemplate gst_rtpmp4vdec_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg," + "mpegversion=(int) 4," "systemstream=(boolean)false") + ); + +static GstStaticPadTemplate gst_rtpmp4vdec_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp" + /* All optional parameters + * + * "rate=(int) [1, MAX]," + * "profile-level-id=[1,MAX]" + * "config=" + */ + ) + ); + + +static void gst_rtpmp4vdec_class_init (GstRtpMP4VDecClass * klass); +static void gst_rtpmp4vdec_base_init (GstRtpMP4VDecClass * klass); +static void gst_rtpmp4vdec_init (GstRtpMP4VDec * rtpmp4vdec); + +static gboolean gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps); +static GstFlowReturn gst_rtpmp4vdec_chain (GstPad * pad, GstBuffer * buffer); + +static void gst_rtpmp4vdec_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtpmp4vdec_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtpmp4vdec_change_state (GstElement * element, + GstStateChange transition); + +static GstElementClass *parent_class = NULL; + +static GType +gst_rtpmp4vdec_get_type (void) +{ + static GType rtpmp4vdec_type = 0; + + if (!rtpmp4vdec_type) { + static const GTypeInfo rtpmp4vdec_info = { + sizeof (GstRtpMP4VDecClass), + (GBaseInitFunc) gst_rtpmp4vdec_base_init, + NULL, + (GClassInitFunc) gst_rtpmp4vdec_class_init, + NULL, + NULL, + sizeof (GstRtpMP4VDec), + 0, + (GInstanceInitFunc) gst_rtpmp4vdec_init, + }; + + rtpmp4vdec_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstRtpMP4VDec", + &rtpmp4vdec_info, 0); + } + return rtpmp4vdec_type; +} + +static void +gst_rtpmp4vdec_base_init (GstRtpMP4VDecClass * klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4vdec_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4vdec_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_mp4vdec_details); +} + +static void +gst_rtpmp4vdec_class_init (GstRtpMP4VDecClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + + gobject_class->set_property = gst_rtpmp4vdec_set_property; + gobject_class->get_property = gst_rtpmp4vdec_get_property; + + gstelement_class->change_state = gst_rtpmp4vdec_change_state; +} + +static void +gst_rtpmp4vdec_init (GstRtpMP4VDec * rtpmp4vdec) +{ + rtpmp4vdec->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4vdec_src_template), "src"); + gst_element_add_pad (GST_ELEMENT (rtpmp4vdec), rtpmp4vdec->srcpad); + + rtpmp4vdec->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4vdec_sink_template), "sink"); + gst_pad_set_setcaps_function (rtpmp4vdec->sinkpad, gst_rtpmp4vdec_setcaps); + gst_pad_set_chain_function (rtpmp4vdec->sinkpad, gst_rtpmp4vdec_chain); + gst_element_add_pad (GST_ELEMENT (rtpmp4vdec), rtpmp4vdec->sinkpad); +} + +static gboolean +gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps) +{ + GstStructure *structure; + GstRtpMP4VDec *rtpmp4vdec; + GstCaps *srccaps; + + rtpmp4vdec = GST_RTP_MP4V_DEC (GST_OBJECT_PARENT (pad)); + + structure = gst_caps_get_structure (caps, 0); + + if (!gst_structure_get_int (structure, "rate", &rtpmp4vdec->rate)) + rtpmp4vdec->rate = 90000; + + srccaps = gst_caps_new_simple ("video/mpeg", + "mpegversion", G_TYPE_INT, 4, + "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); + gst_pad_set_caps (rtpmp4vdec->srcpad, srccaps); + gst_caps_unref (srccaps); + + return TRUE; +} + +static GstFlowReturn +gst_rtpmp4vdec_chain (GstPad * pad, GstBuffer * buf) +{ + GstRtpMP4VDec *rtpmp4vdec; + GstBuffer *outbuf; + GstFlowReturn ret; + + rtpmp4vdec = GST_RTP_MP4V_DEC (gst_pad_get_parent (pad)); + + if (!gst_rtpbuffer_validate (buf)) + goto bad_packet; + + { + gint payload_len; + guint8 *payload; + guint32 timestamp; + + payload_len = gst_rtpbuffer_get_payload_len (buf); + payload = gst_rtpbuffer_get_payload (buf); + + timestamp = gst_rtpbuffer_get_timestamp (buf); + + outbuf = gst_buffer_new_and_alloc (payload_len); + memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len); + + gst_adapter_push (rtpmp4vdec->adapter, outbuf); + + /* if this was the last packet of the VOP, create and push a buffer */ + if (gst_rtpbuffer_get_marker (buf)) { + guint avail; + + avail = gst_adapter_available (rtpmp4vdec->adapter); + + outbuf = gst_buffer_new_and_alloc (avail); + GST_BUFFER_MALLOCDATA (outbuf) = + gst_adapter_take (rtpmp4vdec->adapter, avail); + GST_BUFFER_DATA (outbuf) = GST_BUFFER_MALLOCDATA (outbuf); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (rtpmp4vdec->srcpad)); + GST_BUFFER_TIMESTAMP (outbuf) = timestamp * GST_SECOND / rtpmp4vdec->rate; + + GST_DEBUG ("gst_rtpmp4vdec_chain: pushing buffer of size %d", + GST_BUFFER_SIZE (outbuf)); + + ret = gst_pad_push (rtpmp4vdec->srcpad, outbuf); + } else { + ret = GST_FLOW_OK; + } + gst_buffer_unref (buf); + } + gst_object_unref (rtpmp4vdec); + + return ret; +bad_packet: + { + GST_DEBUG ("Packet did not validate"); + gst_buffer_unref (buf); + gst_object_unref (rtpmp4vdec); + + return GST_FLOW_ERROR; + } +} + +static void +gst_rtpmp4vdec_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpMP4VDec *rtpmp4vdec; + + rtpmp4vdec = GST_RTP_MP4V_DEC (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtpmp4vdec_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * pspec) +{ + GstRtpMP4VDec *rtpmp4vdec; + + rtpmp4vdec = GST_RTP_MP4V_DEC (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtpmp4vdec_change_state (GstElement * element, GstStateChange transition) +{ + GstRtpMP4VDec *rtpmp4vdec; + GstStateChangeReturn ret; + + rtpmp4vdec = GST_RTP_MP4V_DEC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + rtpmp4vdec->adapter = gst_adapter_new (); + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + gst_adapter_clear (rtpmp4vdec->adapter); + rtpmp4vdec->rate = 90000; + break; + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_NULL: + g_object_unref (rtpmp4vdec->adapter); + rtpmp4vdec->adapter = NULL; + break; + default: + break; + } + return ret; +} + +gboolean +gst_rtpmp4vdec_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmp4vdec", + GST_RANK_NONE, GST_TYPE_RTP_MP4V_DEC); +} diff --git a/gst/rtp/gstrtpmp4vdec.h b/gst/rtp/gstrtpmp4vdec.h new file mode 100644 index 0000000000..8a2100a1ed --- /dev/null +++ b/gst/rtp/gstrtpmp4vdec.h @@ -0,0 +1,63 @@ +/* Gnome-Streamer + * Copyright (C) <2005> 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_MP4V_DEC_H__ +#define __GST_RTP_MP4V_DEC_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_MP4V_DEC \ + (gst_rtpmp4vdec_get_type()) +#define GST_RTP_MP4V_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP4V_DEC,GstRtpMP4VDec)) +#define GST_RTP_MP4V_DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP4V_DEC,GstRtpMP4VDec)) +#define GST_IS_RTP_MP4V_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP4V_DEC)) +#define GST_IS_RTP_MP4V_DEC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP4V_DEC)) + +typedef struct _GstRtpMP4VDec GstRtpMP4VDec; +typedef struct _GstRtpMP4VDecClass GstRtpMP4VDecClass; + +struct _GstRtpMP4VDec +{ + GstElement element; + + GstPad *sinkpad; + GstPad *srcpad; + + GstAdapter *adapter; + + gint rate; +}; + +struct _GstRtpMP4VDecClass +{ + GstElementClass parent_class; +}; + +gboolean gst_rtpmp4vdec_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MP4V_DEC_H__ */ diff --git a/gst/rtp/gstrtpmp4vdepay.c b/gst/rtp/gstrtpmp4vdepay.c new file mode 100644 index 0000000000..39ab5df955 --- /dev/null +++ b/gst/rtp/gstrtpmp4vdepay.c @@ -0,0 +1,309 @@ +/* GStreamer + * Copyright (C) <2005> 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 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include "gstrtpmp4vdec.h" + +/* elementfactory information */ +static GstElementDetails gst_rtp_mp4vdec_details = { + "RTP packet parser", + "Codec/Parser/Network", + "Extracts MPEG4 video from RTP packets (RFC 3016)", + "Wim Taymans " +}; + +/* RtpMP4VDec signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +enum +{ + ARG_0, + ARG_FREQUENCY +}; + +static GstStaticPadTemplate gst_rtpmp4vdec_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg," + "mpegversion=(int) 4," "systemstream=(boolean)false") + ); + +static GstStaticPadTemplate gst_rtpmp4vdec_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp" + /* All optional parameters + * + * "rate=(int) [1, MAX]," + * "profile-level-id=[1,MAX]" + * "config=" + */ + ) + ); + + +static void gst_rtpmp4vdec_class_init (GstRtpMP4VDecClass * klass); +static void gst_rtpmp4vdec_base_init (GstRtpMP4VDecClass * klass); +static void gst_rtpmp4vdec_init (GstRtpMP4VDec * rtpmp4vdec); + +static gboolean gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps); +static GstFlowReturn gst_rtpmp4vdec_chain (GstPad * pad, GstBuffer * buffer); + +static void gst_rtpmp4vdec_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtpmp4vdec_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtpmp4vdec_change_state (GstElement * element, + GstStateChange transition); + +static GstElementClass *parent_class = NULL; + +static GType +gst_rtpmp4vdec_get_type (void) +{ + static GType rtpmp4vdec_type = 0; + + if (!rtpmp4vdec_type) { + static const GTypeInfo rtpmp4vdec_info = { + sizeof (GstRtpMP4VDecClass), + (GBaseInitFunc) gst_rtpmp4vdec_base_init, + NULL, + (GClassInitFunc) gst_rtpmp4vdec_class_init, + NULL, + NULL, + sizeof (GstRtpMP4VDec), + 0, + (GInstanceInitFunc) gst_rtpmp4vdec_init, + }; + + rtpmp4vdec_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstRtpMP4VDec", + &rtpmp4vdec_info, 0); + } + return rtpmp4vdec_type; +} + +static void +gst_rtpmp4vdec_base_init (GstRtpMP4VDecClass * klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4vdec_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4vdec_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_mp4vdec_details); +} + +static void +gst_rtpmp4vdec_class_init (GstRtpMP4VDecClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + + gobject_class->set_property = gst_rtpmp4vdec_set_property; + gobject_class->get_property = gst_rtpmp4vdec_get_property; + + gstelement_class->change_state = gst_rtpmp4vdec_change_state; +} + +static void +gst_rtpmp4vdec_init (GstRtpMP4VDec * rtpmp4vdec) +{ + rtpmp4vdec->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4vdec_src_template), "src"); + gst_element_add_pad (GST_ELEMENT (rtpmp4vdec), rtpmp4vdec->srcpad); + + rtpmp4vdec->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4vdec_sink_template), "sink"); + gst_pad_set_setcaps_function (rtpmp4vdec->sinkpad, gst_rtpmp4vdec_setcaps); + gst_pad_set_chain_function (rtpmp4vdec->sinkpad, gst_rtpmp4vdec_chain); + gst_element_add_pad (GST_ELEMENT (rtpmp4vdec), rtpmp4vdec->sinkpad); +} + +static gboolean +gst_rtpmp4vdec_setcaps (GstPad * pad, GstCaps * caps) +{ + GstStructure *structure; + GstRtpMP4VDec *rtpmp4vdec; + GstCaps *srccaps; + + rtpmp4vdec = GST_RTP_MP4V_DEC (GST_OBJECT_PARENT (pad)); + + structure = gst_caps_get_structure (caps, 0); + + if (!gst_structure_get_int (structure, "rate", &rtpmp4vdec->rate)) + rtpmp4vdec->rate = 90000; + + srccaps = gst_caps_new_simple ("video/mpeg", + "mpegversion", G_TYPE_INT, 4, + "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); + gst_pad_set_caps (rtpmp4vdec->srcpad, srccaps); + gst_caps_unref (srccaps); + + return TRUE; +} + +static GstFlowReturn +gst_rtpmp4vdec_chain (GstPad * pad, GstBuffer * buf) +{ + GstRtpMP4VDec *rtpmp4vdec; + GstBuffer *outbuf; + GstFlowReturn ret; + + rtpmp4vdec = GST_RTP_MP4V_DEC (gst_pad_get_parent (pad)); + + if (!gst_rtpbuffer_validate (buf)) + goto bad_packet; + + { + gint payload_len; + guint8 *payload; + guint32 timestamp; + + payload_len = gst_rtpbuffer_get_payload_len (buf); + payload = gst_rtpbuffer_get_payload (buf); + + timestamp = gst_rtpbuffer_get_timestamp (buf); + + outbuf = gst_buffer_new_and_alloc (payload_len); + memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len); + + gst_adapter_push (rtpmp4vdec->adapter, outbuf); + + /* if this was the last packet of the VOP, create and push a buffer */ + if (gst_rtpbuffer_get_marker (buf)) { + guint avail; + + avail = gst_adapter_available (rtpmp4vdec->adapter); + + outbuf = gst_buffer_new_and_alloc (avail); + GST_BUFFER_MALLOCDATA (outbuf) = + gst_adapter_take (rtpmp4vdec->adapter, avail); + GST_BUFFER_DATA (outbuf) = GST_BUFFER_MALLOCDATA (outbuf); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (rtpmp4vdec->srcpad)); + GST_BUFFER_TIMESTAMP (outbuf) = timestamp * GST_SECOND / rtpmp4vdec->rate; + + GST_DEBUG ("gst_rtpmp4vdec_chain: pushing buffer of size %d", + GST_BUFFER_SIZE (outbuf)); + + ret = gst_pad_push (rtpmp4vdec->srcpad, outbuf); + } else { + ret = GST_FLOW_OK; + } + gst_buffer_unref (buf); + } + gst_object_unref (rtpmp4vdec); + + return ret; +bad_packet: + { + GST_DEBUG ("Packet did not validate"); + gst_buffer_unref (buf); + gst_object_unref (rtpmp4vdec); + + return GST_FLOW_ERROR; + } +} + +static void +gst_rtpmp4vdec_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpMP4VDec *rtpmp4vdec; + + rtpmp4vdec = GST_RTP_MP4V_DEC (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtpmp4vdec_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * pspec) +{ + GstRtpMP4VDec *rtpmp4vdec; + + rtpmp4vdec = GST_RTP_MP4V_DEC (object); + + switch (prop_id) { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtpmp4vdec_change_state (GstElement * element, GstStateChange transition) +{ + GstRtpMP4VDec *rtpmp4vdec; + GstStateChangeReturn ret; + + rtpmp4vdec = GST_RTP_MP4V_DEC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + rtpmp4vdec->adapter = gst_adapter_new (); + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + gst_adapter_clear (rtpmp4vdec->adapter); + rtpmp4vdec->rate = 90000; + break; + default: + break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { + case GST_STATE_CHANGE_READY_TO_NULL: + g_object_unref (rtpmp4vdec->adapter); + rtpmp4vdec->adapter = NULL; + break; + default: + break; + } + return ret; +} + +gboolean +gst_rtpmp4vdec_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmp4vdec", + GST_RANK_NONE, GST_TYPE_RTP_MP4V_DEC); +} diff --git a/gst/rtp/gstrtpmp4vdepay.h b/gst/rtp/gstrtpmp4vdepay.h new file mode 100644 index 0000000000..8a2100a1ed --- /dev/null +++ b/gst/rtp/gstrtpmp4vdepay.h @@ -0,0 +1,63 @@ +/* Gnome-Streamer + * Copyright (C) <2005> 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_MP4V_DEC_H__ +#define __GST_RTP_MP4V_DEC_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_MP4V_DEC \ + (gst_rtpmp4vdec_get_type()) +#define GST_RTP_MP4V_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP4V_DEC,GstRtpMP4VDec)) +#define GST_RTP_MP4V_DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP4V_DEC,GstRtpMP4VDec)) +#define GST_IS_RTP_MP4V_DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP4V_DEC)) +#define GST_IS_RTP_MP4V_DEC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP4V_DEC)) + +typedef struct _GstRtpMP4VDec GstRtpMP4VDec; +typedef struct _GstRtpMP4VDecClass GstRtpMP4VDecClass; + +struct _GstRtpMP4VDec +{ + GstElement element; + + GstPad *sinkpad; + GstPad *srcpad; + + GstAdapter *adapter; + + gint rate; +}; + +struct _GstRtpMP4VDecClass +{ + GstElementClass parent_class; +}; + +gboolean gst_rtpmp4vdec_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MP4V_DEC_H__ */ diff --git a/gst/rtp/gstrtpmp4venc.c b/gst/rtp/gstrtpmp4venc.c new file mode 100644 index 0000000000..13b1e33d51 --- /dev/null +++ b/gst/rtp/gstrtpmp4venc.c @@ -0,0 +1,385 @@ +/* GStreamer + * Copyright (C) <2005> 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 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include + +#include "gstrtpmp4venc.h" + +/* elementfactory information */ +static GstElementDetails gst_rtp_mp4venc_details = { + "RTP packet parser", + "Codec/Parser/Network", + "Encode MPEG4 video as RTP packets (RFC 3016)", + "Wim Taymans " +}; + +/* RtpMP4VEnc signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +#define DEFAULT_MTU 1024 +#define DEFAULT_PT 96 +#define DEFAULT_SSRC 0 + +enum +{ + PROP_0, + PROP_MTU, + PROP_PT, + PROP_SSRC +}; + +static GstStaticPadTemplate gst_rtpmp4venc_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg," + "mpegversion=(int) 4," "systemstream=(boolean)false") + ); + +static GstStaticPadTemplate gst_rtpmp4venc_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp," + "rate=(int) [1, MAX]," "profile-level-id=[1,MAX]" + /* "config=" */ + ) + ); + + +static void gst_rtpmp4venc_class_init (GstRtpMP4VEncClass * klass); +static void gst_rtpmp4venc_base_init (GstRtpMP4VEncClass * klass); +static void gst_rtpmp4venc_init (GstRtpMP4VEnc * rtpmp4venc); + +static gboolean gst_rtpmp4venc_setcaps (GstPad * pad, GstCaps * caps); +static GstFlowReturn gst_rtpmp4venc_chain (GstPad * pad, GstBuffer * buffer); + +static void gst_rtpmp4venc_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtpmp4venc_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtpmp4venc_change_state (GstElement * element, + GstStateChange transition); + +static GstElementClass *parent_class = NULL; + +static GType +gst_rtpmp4venc_get_type (void) +{ + static GType rtpmp4venc_type = 0; + + if (!rtpmp4venc_type) { + static const GTypeInfo rtpmp4venc_info = { + sizeof (GstRtpMP4VEncClass), + (GBaseInitFunc) gst_rtpmp4venc_base_init, + NULL, + (GClassInitFunc) gst_rtpmp4venc_class_init, + NULL, + NULL, + sizeof (GstRtpMP4VEnc), + 0, + (GInstanceInitFunc) gst_rtpmp4venc_init, + }; + + rtpmp4venc_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstRtpMP4VEnc", + &rtpmp4venc_info, 0); + } + return rtpmp4venc_type; +} + +static void +gst_rtpmp4venc_base_init (GstRtpMP4VEncClass * klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4venc_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4venc_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_mp4venc_details); +} + +static void +gst_rtpmp4venc_class_init (GstRtpMP4VEncClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + + gobject_class->set_property = gst_rtpmp4venc_set_property; + gobject_class->get_property = gst_rtpmp4venc_get_property; + + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MTU, + g_param_spec_uint ("mtu", "MTU", + "Maximum size of one packet", + 28, G_MAXUINT, DEFAULT_MTU, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PT, + g_param_spec_uint ("pt", "payload type", + "The payload type of the packets", + 0, 0x80, DEFAULT_PT, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SSRC, + g_param_spec_uint ("ssrc", "SSRC", + "The SSRC of the packets", + 0, G_MAXUINT, DEFAULT_SSRC, G_PARAM_READWRITE)); + + gstelement_class->change_state = gst_rtpmp4venc_change_state; +} + +static void +gst_rtpmp4venc_init (GstRtpMP4VEnc * rtpmp4venc) +{ + rtpmp4venc->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4venc_src_template), "src"); + gst_element_add_pad (GST_ELEMENT (rtpmp4venc), rtpmp4venc->srcpad); + + rtpmp4venc->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4venc_sink_template), "sink"); + gst_pad_set_setcaps_function (rtpmp4venc->sinkpad, gst_rtpmp4venc_setcaps); + gst_pad_set_chain_function (rtpmp4venc->sinkpad, gst_rtpmp4venc_chain); + gst_element_add_pad (GST_ELEMENT (rtpmp4venc), rtpmp4venc->sinkpad); + + rtpmp4venc->adapter = gst_adapter_new (); + rtpmp4venc->mtu = DEFAULT_MTU; + rtpmp4venc->pt = DEFAULT_PT; + rtpmp4venc->ssrc = DEFAULT_SSRC; + rtpmp4venc->rate = 90000; + rtpmp4venc->profile = 1; +} + +static gboolean +gst_rtpmp4venc_setcaps (GstPad * pad, GstCaps * caps) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstCaps *srccaps; + + rtpmp4venc = GST_RTP_MP4V_ENC (gst_pad_get_parent (pad)); + + srccaps = gst_caps_new_simple ("application/x-rtp", + "rate", G_TYPE_INT, rtpmp4venc->rate, + "profile-level-id", G_TYPE_INT, rtpmp4venc->profile, NULL); + gst_pad_set_caps (rtpmp4venc->srcpad, srccaps); + gst_caps_unref (srccaps); + + gst_object_unref (rtpmp4venc); + + return TRUE; +} + +static GstFlowReturn +gst_rtpmp4venc_flush (GstRtpMP4VEnc * rtpmp4venc) +{ + guint avail; + GstBuffer *outbuf; + GstFlowReturn ret; + guint16 frag_offset; + + /* the data available in the adapter is either smaller + * than the MTU or bigger. In the case it is smaller, the complete + * adapter contents can be put in one packet. In the case the + * adapter has more than one MTU, we need to split the MP4V data + * over multiple packets. */ + avail = gst_adapter_available (rtpmp4venc->adapter); + + ret = GST_FLOW_OK; + + frag_offset = 0; + while (avail > 0) { + guint towrite; + guint8 *payload; + guint8 *data; + guint payload_len; + guint packet_len; + + /* this will be the total lenght of the packet */ + packet_len = gst_rtpbuffer_calc_packet_len (avail, 0, 0); + + /* fill one MTU or all available bytes */ + towrite = MIN (packet_len, rtpmp4venc->mtu); + + /* this is the payload length */ + payload_len = gst_rtpbuffer_calc_payload_len (towrite, 0, 0); + + /* create buffer to hold the payload */ + outbuf = gst_rtpbuffer_new_allocate (payload_len, 0, 0); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (rtpmp4venc->srcpad)); + + /* set timestamp */ + if (GST_CLOCK_TIME_IS_VALID (rtpmp4venc->first_ts)) { + gst_rtpbuffer_set_timestamp (outbuf, + rtpmp4venc->first_ts * 90000 / GST_SECOND); + } + gst_rtpbuffer_set_payload_type (outbuf, rtpmp4venc->pt); + gst_rtpbuffer_set_seq (outbuf, rtpmp4venc->seqnum++); + + payload = gst_rtpbuffer_get_payload (outbuf); + + data = (guint8 *) gst_adapter_peek (rtpmp4venc->adapter, payload_len); + memcpy (payload, data, payload_len); + gst_adapter_flush (rtpmp4venc->adapter, payload_len); + + avail -= payload_len; + frag_offset += payload_len; + + gst_rtpbuffer_set_marker (outbuf, avail == 0); + + GST_BUFFER_TIMESTAMP (outbuf) = rtpmp4venc->first_ts; + + ret = gst_pad_push (rtpmp4venc->srcpad, outbuf); + } + + return ret; +} + +/* we expect buffers starting on startcodes. + * + * FIXME, need to flush the adapter if we receive non VOP + * packets. + */ +static GstFlowReturn +gst_rtpmp4venc_chain (GstPad * pad, GstBuffer * buffer) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstFlowReturn ret; + guint size, avail; + guint packet_len; + + rtpmp4venc = GST_RTP_MP4V_ENC (gst_pad_get_parent (pad)); + + size = GST_BUFFER_SIZE (buffer); + avail = gst_adapter_available (rtpmp4venc->adapter); + + /* get packet length of previous data and this new data */ + packet_len = gst_rtpbuffer_calc_packet_len (avail + size, 0, 0); + + /* if this buffer is going to overflow the packet, flush what we + * have. */ + if (packet_len > rtpmp4venc->mtu) { + ret = gst_rtpmp4venc_flush (rtpmp4venc); + avail = 0; + } + + gst_adapter_push (rtpmp4venc->adapter, buffer); + + if (avail == 0) { + rtpmp4venc->first_ts = GST_BUFFER_TIMESTAMP (buffer); + } + gst_object_unref (rtpmp4venc); + + ret = GST_FLOW_OK; + + return ret; +} + +static void +gst_rtpmp4venc_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpMP4VEnc *rtpmp4venc; + + rtpmp4venc = GST_RTP_MP4V_ENC (object); + + switch (prop_id) { + case PROP_MTU: + rtpmp4venc->mtu = g_value_get_uint (value); + break; + case PROP_PT: + rtpmp4venc->pt = g_value_get_uint (value); + break; + case PROP_SSRC: + rtpmp4venc->ssrc = g_value_get_uint (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtpmp4venc_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * pspec) +{ + GstRtpMP4VEnc *rtpmp4venc; + + rtpmp4venc = GST_RTP_MP4V_ENC (object); + + switch (prop_id) { + case PROP_MTU: + g_value_set_uint (value, rtpmp4venc->mtu); + break; + case PROP_PT: + g_value_set_uint (value, rtpmp4venc->pt); + break; + case PROP_SSRC: + g_value_set_uint (value, rtpmp4venc->ssrc); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtpmp4venc_change_state (GstElement * element, GstStateChange transition) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstStateChangeReturn ret; + + rtpmp4venc = GST_RTP_MP4V_ENC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + rtpmp4venc->seqnum = 0; + 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_rtpmp4venc_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmp4venc", + GST_RANK_NONE, GST_TYPE_RTP_MP4V_ENC); +} diff --git a/gst/rtp/gstrtpmp4venc.h b/gst/rtp/gstrtpmp4venc.h new file mode 100644 index 0000000000..b694903983 --- /dev/null +++ b/gst/rtp/gstrtpmp4venc.h @@ -0,0 +1,70 @@ +/* Gnome-Streamer + * Copyright (C) <2005> 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_MP4V_ENC_H__ +#define __GST_RTP_MP4V_ENC_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_MP4V_ENC \ + (gst_rtpmp4venc_get_type()) +#define GST_RTP_MP4V_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP4V_ENC,GstRtpMP4VEnc)) +#define GST_RTP_MP4V_ENC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP4V_ENC,GstRtpMP4VEnc)) +#define GST_IS_RTP_MP4V_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP4V_ENC)) +#define GST_IS_RTP_MP4V_ENC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP4V_ENC)) + +typedef struct _GstRtpMP4VEnc GstRtpMP4VEnc; +typedef struct _GstRtpMP4VEncClass GstRtpMP4VEncClass; + +struct _GstRtpMP4VEnc +{ + GstElement element; + + GstPad *sinkpad; + GstPad *srcpad; + + GstAdapter *adapter; + GstClockTime first_ts; + guint16 seqnum; + + gint rate; + gint profile; + + guint mtu; + guint pt; + guint ssrc; +}; + +struct _GstRtpMP4VEncClass +{ + GstElementClass parent_class; +}; + +gboolean gst_rtpmp4venc_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MP4V_ENC_H__ */ diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c new file mode 100644 index 0000000000..13b1e33d51 --- /dev/null +++ b/gst/rtp/gstrtpmp4vpay.c @@ -0,0 +1,385 @@ +/* GStreamer + * Copyright (C) <2005> 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 + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include + +#include "gstrtpmp4venc.h" + +/* elementfactory information */ +static GstElementDetails gst_rtp_mp4venc_details = { + "RTP packet parser", + "Codec/Parser/Network", + "Encode MPEG4 video as RTP packets (RFC 3016)", + "Wim Taymans " +}; + +/* RtpMP4VEnc signals and args */ +enum +{ + /* FILL ME */ + LAST_SIGNAL +}; + +#define DEFAULT_MTU 1024 +#define DEFAULT_PT 96 +#define DEFAULT_SSRC 0 + +enum +{ + PROP_0, + PROP_MTU, + PROP_PT, + PROP_SSRC +}; + +static GstStaticPadTemplate gst_rtpmp4venc_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg," + "mpegversion=(int) 4," "systemstream=(boolean)false") + ); + +static GstStaticPadTemplate gst_rtpmp4venc_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp," + "rate=(int) [1, MAX]," "profile-level-id=[1,MAX]" + /* "config=" */ + ) + ); + + +static void gst_rtpmp4venc_class_init (GstRtpMP4VEncClass * klass); +static void gst_rtpmp4venc_base_init (GstRtpMP4VEncClass * klass); +static void gst_rtpmp4venc_init (GstRtpMP4VEnc * rtpmp4venc); + +static gboolean gst_rtpmp4venc_setcaps (GstPad * pad, GstCaps * caps); +static GstFlowReturn gst_rtpmp4venc_chain (GstPad * pad, GstBuffer * buffer); + +static void gst_rtpmp4venc_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_rtpmp4venc_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static GstStateChangeReturn gst_rtpmp4venc_change_state (GstElement * element, + GstStateChange transition); + +static GstElementClass *parent_class = NULL; + +static GType +gst_rtpmp4venc_get_type (void) +{ + static GType rtpmp4venc_type = 0; + + if (!rtpmp4venc_type) { + static const GTypeInfo rtpmp4venc_info = { + sizeof (GstRtpMP4VEncClass), + (GBaseInitFunc) gst_rtpmp4venc_base_init, + NULL, + (GClassInitFunc) gst_rtpmp4venc_class_init, + NULL, + NULL, + sizeof (GstRtpMP4VEnc), + 0, + (GInstanceInitFunc) gst_rtpmp4venc_init, + }; + + rtpmp4venc_type = + g_type_register_static (GST_TYPE_ELEMENT, "GstRtpMP4VEnc", + &rtpmp4venc_info, 0); + } + return rtpmp4venc_type; +} + +static void +gst_rtpmp4venc_base_init (GstRtpMP4VEncClass * klass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (klass); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4venc_src_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtpmp4venc_sink_template)); + + gst_element_class_set_details (element_class, &gst_rtp_mp4venc_details); +} + +static void +gst_rtpmp4venc_class_init (GstRtpMP4VEncClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + + parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + + gobject_class->set_property = gst_rtpmp4venc_set_property; + gobject_class->get_property = gst_rtpmp4venc_get_property; + + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_MTU, + g_param_spec_uint ("mtu", "MTU", + "Maximum size of one packet", + 28, G_MAXUINT, DEFAULT_MTU, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_PT, + g_param_spec_uint ("pt", "payload type", + "The payload type of the packets", + 0, 0x80, DEFAULT_PT, G_PARAM_READWRITE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), PROP_SSRC, + g_param_spec_uint ("ssrc", "SSRC", + "The SSRC of the packets", + 0, G_MAXUINT, DEFAULT_SSRC, G_PARAM_READWRITE)); + + gstelement_class->change_state = gst_rtpmp4venc_change_state; +} + +static void +gst_rtpmp4venc_init (GstRtpMP4VEnc * rtpmp4venc) +{ + rtpmp4venc->srcpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4venc_src_template), "src"); + gst_element_add_pad (GST_ELEMENT (rtpmp4venc), rtpmp4venc->srcpad); + + rtpmp4venc->sinkpad = + gst_pad_new_from_template (gst_static_pad_template_get + (&gst_rtpmp4venc_sink_template), "sink"); + gst_pad_set_setcaps_function (rtpmp4venc->sinkpad, gst_rtpmp4venc_setcaps); + gst_pad_set_chain_function (rtpmp4venc->sinkpad, gst_rtpmp4venc_chain); + gst_element_add_pad (GST_ELEMENT (rtpmp4venc), rtpmp4venc->sinkpad); + + rtpmp4venc->adapter = gst_adapter_new (); + rtpmp4venc->mtu = DEFAULT_MTU; + rtpmp4venc->pt = DEFAULT_PT; + rtpmp4venc->ssrc = DEFAULT_SSRC; + rtpmp4venc->rate = 90000; + rtpmp4venc->profile = 1; +} + +static gboolean +gst_rtpmp4venc_setcaps (GstPad * pad, GstCaps * caps) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstCaps *srccaps; + + rtpmp4venc = GST_RTP_MP4V_ENC (gst_pad_get_parent (pad)); + + srccaps = gst_caps_new_simple ("application/x-rtp", + "rate", G_TYPE_INT, rtpmp4venc->rate, + "profile-level-id", G_TYPE_INT, rtpmp4venc->profile, NULL); + gst_pad_set_caps (rtpmp4venc->srcpad, srccaps); + gst_caps_unref (srccaps); + + gst_object_unref (rtpmp4venc); + + return TRUE; +} + +static GstFlowReturn +gst_rtpmp4venc_flush (GstRtpMP4VEnc * rtpmp4venc) +{ + guint avail; + GstBuffer *outbuf; + GstFlowReturn ret; + guint16 frag_offset; + + /* the data available in the adapter is either smaller + * than the MTU or bigger. In the case it is smaller, the complete + * adapter contents can be put in one packet. In the case the + * adapter has more than one MTU, we need to split the MP4V data + * over multiple packets. */ + avail = gst_adapter_available (rtpmp4venc->adapter); + + ret = GST_FLOW_OK; + + frag_offset = 0; + while (avail > 0) { + guint towrite; + guint8 *payload; + guint8 *data; + guint payload_len; + guint packet_len; + + /* this will be the total lenght of the packet */ + packet_len = gst_rtpbuffer_calc_packet_len (avail, 0, 0); + + /* fill one MTU or all available bytes */ + towrite = MIN (packet_len, rtpmp4venc->mtu); + + /* this is the payload length */ + payload_len = gst_rtpbuffer_calc_payload_len (towrite, 0, 0); + + /* create buffer to hold the payload */ + outbuf = gst_rtpbuffer_new_allocate (payload_len, 0, 0); + gst_buffer_set_caps (outbuf, GST_PAD_CAPS (rtpmp4venc->srcpad)); + + /* set timestamp */ + if (GST_CLOCK_TIME_IS_VALID (rtpmp4venc->first_ts)) { + gst_rtpbuffer_set_timestamp (outbuf, + rtpmp4venc->first_ts * 90000 / GST_SECOND); + } + gst_rtpbuffer_set_payload_type (outbuf, rtpmp4venc->pt); + gst_rtpbuffer_set_seq (outbuf, rtpmp4venc->seqnum++); + + payload = gst_rtpbuffer_get_payload (outbuf); + + data = (guint8 *) gst_adapter_peek (rtpmp4venc->adapter, payload_len); + memcpy (payload, data, payload_len); + gst_adapter_flush (rtpmp4venc->adapter, payload_len); + + avail -= payload_len; + frag_offset += payload_len; + + gst_rtpbuffer_set_marker (outbuf, avail == 0); + + GST_BUFFER_TIMESTAMP (outbuf) = rtpmp4venc->first_ts; + + ret = gst_pad_push (rtpmp4venc->srcpad, outbuf); + } + + return ret; +} + +/* we expect buffers starting on startcodes. + * + * FIXME, need to flush the adapter if we receive non VOP + * packets. + */ +static GstFlowReturn +gst_rtpmp4venc_chain (GstPad * pad, GstBuffer * buffer) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstFlowReturn ret; + guint size, avail; + guint packet_len; + + rtpmp4venc = GST_RTP_MP4V_ENC (gst_pad_get_parent (pad)); + + size = GST_BUFFER_SIZE (buffer); + avail = gst_adapter_available (rtpmp4venc->adapter); + + /* get packet length of previous data and this new data */ + packet_len = gst_rtpbuffer_calc_packet_len (avail + size, 0, 0); + + /* if this buffer is going to overflow the packet, flush what we + * have. */ + if (packet_len > rtpmp4venc->mtu) { + ret = gst_rtpmp4venc_flush (rtpmp4venc); + avail = 0; + } + + gst_adapter_push (rtpmp4venc->adapter, buffer); + + if (avail == 0) { + rtpmp4venc->first_ts = GST_BUFFER_TIMESTAMP (buffer); + } + gst_object_unref (rtpmp4venc); + + ret = GST_FLOW_OK; + + return ret; +} + +static void +gst_rtpmp4venc_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstRtpMP4VEnc *rtpmp4venc; + + rtpmp4venc = GST_RTP_MP4V_ENC (object); + + switch (prop_id) { + case PROP_MTU: + rtpmp4venc->mtu = g_value_get_uint (value); + break; + case PROP_PT: + rtpmp4venc->pt = g_value_get_uint (value); + break; + case PROP_SSRC: + rtpmp4venc->ssrc = g_value_get_uint (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_rtpmp4venc_get_property (GObject * object, guint prop_id, GValue * value, + GParamSpec * pspec) +{ + GstRtpMP4VEnc *rtpmp4venc; + + rtpmp4venc = GST_RTP_MP4V_ENC (object); + + switch (prop_id) { + case PROP_MTU: + g_value_set_uint (value, rtpmp4venc->mtu); + break; + case PROP_PT: + g_value_set_uint (value, rtpmp4venc->pt); + break; + case PROP_SSRC: + g_value_set_uint (value, rtpmp4venc->ssrc); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstStateChangeReturn +gst_rtpmp4venc_change_state (GstElement * element, GstStateChange transition) +{ + GstRtpMP4VEnc *rtpmp4venc; + GstStateChangeReturn ret; + + rtpmp4venc = GST_RTP_MP4V_ENC (element); + + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + break; + case GST_STATE_CHANGE_READY_TO_PAUSED: + rtpmp4venc->seqnum = 0; + 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_rtpmp4venc_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmp4venc", + GST_RANK_NONE, GST_TYPE_RTP_MP4V_ENC); +} diff --git a/gst/rtp/gstrtpmp4vpay.h b/gst/rtp/gstrtpmp4vpay.h new file mode 100644 index 0000000000..b694903983 --- /dev/null +++ b/gst/rtp/gstrtpmp4vpay.h @@ -0,0 +1,70 @@ +/* Gnome-Streamer + * Copyright (C) <2005> 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_MP4V_ENC_H__ +#define __GST_RTP_MP4V_ENC_H__ + +#include +#include + +G_BEGIN_DECLS + +#define GST_TYPE_RTP_MP4V_ENC \ + (gst_rtpmp4venc_get_type()) +#define GST_RTP_MP4V_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP4V_ENC,GstRtpMP4VEnc)) +#define GST_RTP_MP4V_ENC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP4V_ENC,GstRtpMP4VEnc)) +#define GST_IS_RTP_MP4V_ENC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP4V_ENC)) +#define GST_IS_RTP_MP4V_ENC_CLASS(obj) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP4V_ENC)) + +typedef struct _GstRtpMP4VEnc GstRtpMP4VEnc; +typedef struct _GstRtpMP4VEncClass GstRtpMP4VEncClass; + +struct _GstRtpMP4VEnc +{ + GstElement element; + + GstPad *sinkpad; + GstPad *srcpad; + + GstAdapter *adapter; + GstClockTime first_ts; + guint16 seqnum; + + gint rate; + gint profile; + + guint mtu; + guint pt; + guint ssrc; +}; + +struct _GstRtpMP4VEncClass +{ + GstElementClass parent_class; +}; + +gboolean gst_rtpmp4venc_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MP4V_ENC_H__ */ diff --git a/gst/rtp/gstrtpmpadec.c b/gst/rtp/gstrtpmpadec.c index d969100c9b..50576a3bf2 100644 --- a/gst/rtp/gstrtpmpadec.c +++ b/gst/rtp/gstrtpmpadec.c @@ -25,7 +25,7 @@ static GstElementDetails gst_rtp_mpadec_details = { "RTP packet parser", "Codec/Parser/Network", - "Extracts MPEG audio from RTP packets", + "Extracts MPEG audio from RTP packets (RFC 2038)", "Wim Taymans " }; @@ -171,7 +171,14 @@ gst_rtpmpadec_chain (GstPad * pad, GstBuffer * buf) frag_offset = (payload[2] << 8) | payload[3]; - /* strip off header */ + /* strip off header + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | MBZ | Frag_offset | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ payload_len -= 4; payload += 4; @@ -188,6 +195,8 @@ gst_rtpmpadec_chain (GstPad * pad, GstBuffer * buf) gst_buffer_unref (buf); + /* FIXME, we can push half mpeg frames when they are split over multiple + * RTP packets */ ret = gst_pad_push (rtpmpadec->srcpad, outbuf); } diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index d969100c9b..50576a3bf2 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -25,7 +25,7 @@ static GstElementDetails gst_rtp_mpadec_details = { "RTP packet parser", "Codec/Parser/Network", - "Extracts MPEG audio from RTP packets", + "Extracts MPEG audio from RTP packets (RFC 2038)", "Wim Taymans " }; @@ -171,7 +171,14 @@ gst_rtpmpadec_chain (GstPad * pad, GstBuffer * buf) frag_offset = (payload[2] << 8) | payload[3]; - /* strip off header */ + /* strip off header + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | MBZ | Frag_offset | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ payload_len -= 4; payload += 4; @@ -188,6 +195,8 @@ gst_rtpmpadec_chain (GstPad * pad, GstBuffer * buf) gst_buffer_unref (buf); + /* FIXME, we can push half mpeg frames when they are split over multiple + * RTP packets */ ret = gst_pad_push (rtpmpadec->srcpad, outbuf); } diff --git a/gst/rtp/gstrtpmpaenc.c b/gst/rtp/gstrtpmpaenc.c index 58b37522c2..6ad805c406 100644 --- a/gst/rtp/gstrtpmpaenc.c +++ b/gst/rtp/gstrtpmpaenc.c @@ -26,7 +26,7 @@ static GstElementDetails gst_rtp_mpaenc_details = { "RTP packet parser", "Codec/Parser/Network", - "Encode MPEG audio as RTP packets", + "Encode MPEG audio as RTP packets (RFC 2038)", "Wim Taymans " }; @@ -200,6 +200,13 @@ gst_rtpmpaenc_flush (GstRtpMPAEnc * rtpmpaenc) gst_rtpbuffer_set_payload_type (outbuf, GST_RTP_PAYLOAD_MPA); gst_rtpbuffer_set_seq (outbuf, rtpmpaenc->seqnum++); + /* + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | MBZ | Frag_offset | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ payload = gst_rtpbuffer_get_payload (outbuf); payload[0] = 0; payload[1] = 0; @@ -210,12 +217,15 @@ gst_rtpmpaenc_flush (GstRtpMPAEnc * rtpmpaenc) memcpy (&payload[4], data, payload_len); gst_adapter_flush (rtpmpaenc->adapter, payload_len); + avail -= payload_len; + frag_offset += payload_len; + + if (avail == 0) + gst_rtpbuffer_set_marker (outbuf, TRUE); + GST_BUFFER_TIMESTAMP (outbuf) = rtpmpaenc->first_ts; ret = gst_pad_push (rtpmpaenc->srcpad, outbuf); - - avail -= payload_len; - frag_offset += payload_len; } return ret; diff --git a/gst/rtp/gstrtpmpapay.c b/gst/rtp/gstrtpmpapay.c index 58b37522c2..6ad805c406 100644 --- a/gst/rtp/gstrtpmpapay.c +++ b/gst/rtp/gstrtpmpapay.c @@ -26,7 +26,7 @@ static GstElementDetails gst_rtp_mpaenc_details = { "RTP packet parser", "Codec/Parser/Network", - "Encode MPEG audio as RTP packets", + "Encode MPEG audio as RTP packets (RFC 2038)", "Wim Taymans " }; @@ -200,6 +200,13 @@ gst_rtpmpaenc_flush (GstRtpMPAEnc * rtpmpaenc) gst_rtpbuffer_set_payload_type (outbuf, GST_RTP_PAYLOAD_MPA); gst_rtpbuffer_set_seq (outbuf, rtpmpaenc->seqnum++); + /* + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | MBZ | Frag_offset | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ payload = gst_rtpbuffer_get_payload (outbuf); payload[0] = 0; payload[1] = 0; @@ -210,12 +217,15 @@ gst_rtpmpaenc_flush (GstRtpMPAEnc * rtpmpaenc) memcpy (&payload[4], data, payload_len); gst_adapter_flush (rtpmpaenc->adapter, payload_len); + avail -= payload_len; + frag_offset += payload_len; + + if (avail == 0) + gst_rtpbuffer_set_marker (outbuf, TRUE); + GST_BUFFER_TIMESTAMP (outbuf) = rtpmpaenc->first_ts; ret = gst_pad_push (rtpmpaenc->srcpad, outbuf); - - avail -= payload_len; - frag_offset += payload_len; } return ret;