From b03d3e0b877b75f4dca226736f5f6b504027b8d4 Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Fri, 25 Jan 2008 10:53:17 +0000 Subject: [PATCH] gst/rtp/: Add MPEG2 video payloader Original commit message from CVS: * gst/rtp/Makefile.am: * gst/rtp/gstrtp.c: * gst/rtp/gstrtpmpvpay.c: * gst/rtp/gstrtpmpvpay.h: Add MPEG2 video payloader --- ChangeLog | 8 ++ common | 2 +- gst/rtp/Makefile.am | 4 +- gst/rtp/gstrtp.c | 4 + gst/rtp/gstrtpmpvpay.c | 238 +++++++++++++++++++++++++++++++++++++++++ gst/rtp/gstrtpmpvpay.h | 62 +++++++++++ 6 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 gst/rtp/gstrtpmpvpay.c create mode 100644 gst/rtp/gstrtpmpvpay.h diff --git a/ChangeLog b/ChangeLog index 6499b103f6..180a391583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-25 Thijs Vermeir + + * gst/rtp/Makefile.am: + * gst/rtp/gstrtp.c: + * gst/rtp/gstrtpmpvpay.c: + * gst/rtp/gstrtpmpvpay.h: + Add MPEG2 video payloader + 2008-01-23 Sebastian Dröge * gst/level/gstlevel.c: diff --git a/common b/common index 662f544d56..571dce3335 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 662f544d56a6d6ef20b8ea5f56e975f9e139bc78 +Subproject commit 571dce3335f9be76978009b3842c050dbb900e6f diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am index a9badefc9d..e78d9bd7c6 100644 --- a/gst/rtp/Makefile.am +++ b/gst/rtp/Makefile.am @@ -10,6 +10,7 @@ libgstrtp_la_SOURCES = \ gstrtpmpadepay.c \ gstrtpmpapay.c \ gstrtpmpvdepay.c \ + gstrtpmpvpay.c \ gstrtppcmadepay.c \ gstrtppcmudepay.c \ gstrtppcmupay.c \ @@ -72,7 +73,8 @@ noinst_HEADERS = \ gstrtpgsmpay.h \ gstrtpmpadepay.h \ gstrtpmpapay.h \ - gstrtpmpvdepay.h \ + gstrtpmpvdepay.h \ + gstrtpmpvpay.h \ gstrtph263pdepay.h \ gstrtph263ppay.h \ gstrtph263depay.h \ diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c index 1eef506d8d..5fde406921 100644 --- a/gst/rtp/gstrtp.c +++ b/gst/rtp/gstrtp.c @@ -36,6 +36,7 @@ #include "gstrtpmpapay.h" #include "gstrtpmpadepay.h" #include "gstrtpmpvdepay.h" +#include "gstrtpmpvpay.h" #include "gstrtph263pdepay.h" #include "gstrtph263ppay.h" #include "gstrtph263depay.h" @@ -108,6 +109,9 @@ plugin_init (GstPlugin * plugin) if (!gst_rtp_mpv_depay_plugin_init (plugin)) return FALSE; + if (!gst_rtp_mpv_pay_plugin_init (plugin)) + return FALSE; + if (!gst_rtp_h263p_pay_plugin_init (plugin)) return FALSE; diff --git a/gst/rtp/gstrtpmpvpay.c b/gst/rtp/gstrtpmpvpay.c new file mode 100644 index 0000000000..087ac729e4 --- /dev/null +++ b/gst/rtp/gstrtpmpvpay.c @@ -0,0 +1,238 @@ +/* GStreamer + * Copyright (C) <2007> Thijs Vermeir + * + * 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 + +#include "gstrtpmpvpay.h" + +static const GstElementDetails gst_rtp_mpv_pay_details = +GST_ELEMENT_DETAILS ("RTP MPEG2 ES video payloader", + "Codec/Payloader/Network", + "Payload-encodes MPEG2 ES into RTP packets (RFC 2250)", + "Thijs Vermeir "); + +static GstStaticPadTemplate gst_rtp_mpv_pay_sink_template = +GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/mpeg, " + "mpegversion = (int) 2, systemstream = (boolean) FALSE") + ); + +static GstStaticPadTemplate gst_rtp_mpv_pay_src_template = +GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-rtp, " + "media = (string) \"video\", " + "payload = (int) " GST_RTP_PAYLOAD_MPV_STRING ", " + "clock-rate = (int) 90000, " "encoding-name = (string) \"MPV\"") + ); + +static gboolean gst_rtp_mpv_pay_setcaps (GstBaseRTPPayload * payload, + GstCaps * caps); +static GstFlowReturn gst_rtp_mpv_pay_handle_buffer (GstBaseRTPPayload * + payload, GstBuffer * buffer); +static GstFlowReturn gst_rtp_mpv_pay_flush (GstRTPMPVPay * rtpmpvpay, + GstClockTime timestamp, GstClockTime duration); +static void gst_rtp_mpv_pay_finalize (GObject * object); + +GST_BOILERPLATE (GstRTPMPVPay, gst_rtp_mpv_pay, GstBaseRTPPayload, + GST_TYPE_BASE_RTP_PAYLOAD); + +static void +gst_rtp_mpv_pay_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_mpv_pay_sink_template)); + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&gst_rtp_mpv_pay_src_template)); + gst_element_class_set_details (element_class, &gst_rtp_mpv_pay_details); +} + +static void +gst_rtp_mpv_pay_class_init (GstRTPMPVPayClass * klass) +{ + GObjectClass *gobject_class; + GstElementClass *gstelement_class; + GstBaseRTPPayloadClass *gstbasertppayload_class; + + gobject_class = (GObjectClass *) klass; + gstelement_class = (GstElementClass *) klass; + gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; + + gobject_class->finalize = gst_rtp_mpv_pay_finalize; + + gstbasertppayload_class->set_caps = gst_rtp_mpv_pay_setcaps; + gstbasertppayload_class->handle_buffer = gst_rtp_mpv_pay_handle_buffer; +} + +static void +gst_rtp_mpv_pay_init (GstRTPMPVPay * rtpmpvpay, GstRTPMPVPayClass * klass) +{ + GST_BASE_RTP_PAYLOAD (rtpmpvpay)->clock_rate = 90000; + GST_BASE_RTP_PAYLOAD_PT (rtpmpvpay) = GST_RTP_PAYLOAD_MPV; + + rtpmpvpay->adapter = gst_adapter_new (); +} + +static void +gst_rtp_mpv_pay_finalize (GObject * object) +{ + GstRTPMPVPay *rtpmpvpay; + + rtpmpvpay = GST_RTP_MPV_PAY (object); + + g_object_unref (rtpmpvpay->adapter); + rtpmpvpay->adapter = NULL; + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static gboolean +gst_rtp_mpv_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) +{ + const char *stname; + GstStructure *structure; + + structure = gst_caps_get_structure (caps, 0); + + stname = gst_structure_get_name (structure); + + gst_basertppayload_set_options (payload, "video", FALSE, "MPV", 90000); + gst_basertppayload_set_outcaps (payload, NULL); + + return TRUE; +} + +static GstFlowReturn +gst_rtp_mpv_pay_flush (GstRTPMPVPay * rtpmpvpay, GstClockTime timestamp, + GstClockTime duration) +{ + GstBuffer *outbuf; + GstFlowReturn ret; + guint avail; + guint8 *payload; + gint packet_size; + gint payload_size; + + avail = gst_adapter_available (rtpmpvpay->adapter); + packet_size = gst_rtp_buffer_calc_packet_len (4 + avail, 0, 0); + + /* check for the maximum size of the rtp buffer */ + if (packet_size > GST_BASE_RTP_PAYLOAD_MTU (rtpmpvpay)) { + payload_size = + GST_BASE_RTP_PAYLOAD_MTU (rtpmpvpay) - + gst_rtp_buffer_calc_packet_len (4, 0, 0); + } else { + payload_size = avail; + } + outbuf = gst_rtp_buffer_new_allocate (4 + payload_size, 0, 0); + /* enable MPEG Video-specific 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 |T| TR | |N|S|B|E| P | | BFC | | FFC | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * AN FBV FFV + */ + payload = gst_rtp_buffer_get_payload (outbuf); + /* fill in the MPEG Video-specific header */ + memset (payload, 0x0, 4); + /* copy stuff from adapter to payload */ + gst_adapter_copy (rtpmpvpay->adapter, payload + 4, 0, payload_size); + GST_BUFFER_TIMESTAMP (outbuf) = rtpmpvpay->first_ts; + GST_BUFFER_DURATION (outbuf) = rtpmpvpay->duration; + + GST_DEBUG_OBJECT (rtpmpvpay, "pushing buffer of size %d", + GST_BUFFER_SIZE (outbuf)); + ret = gst_basertppayload_push (GST_BASE_RTP_PAYLOAD (rtpmpvpay), outbuf); + gst_adapter_flush (rtpmpvpay->adapter, payload_size); + + /* update the timestamp and duration */ + rtpmpvpay->first_ts = timestamp; + rtpmpvpay->duration = duration; + + /* check if there is enough data for another rtp buffer */ + avail = gst_adapter_available (rtpmpvpay->adapter); + packet_size = gst_rtp_buffer_calc_packet_len (4 + avail, 0, 0); + + if (packet_size >= GST_BASE_RTP_PAYLOAD_MTU (rtpmpvpay) && ret == GST_FLOW_OK) { + GST_DEBUG_OBJECT (rtpmpvpay, "Have enough data for another rtp packet"); + ret = gst_rtp_mpv_pay_flush (rtpmpvpay, timestamp, duration); + } + return ret; +} + +static GstFlowReturn +gst_rtp_mpv_pay_handle_buffer (GstBaseRTPPayload * basepayload, + GstBuffer * buffer) +{ + GstRTPMPVPay *rtpmpvpay; + guint size, avail, packet_len; + guint8 *data; + GstClockTime timestamp, duration; + GstFlowReturn ret; + + rtpmpvpay = GST_RTP_MPV_PAY (basepayload); + + size = GST_BUFFER_SIZE (buffer); + data = GST_BUFFER_DATA (buffer); + timestamp = GST_BUFFER_TIMESTAMP (buffer); + duration = GST_BUFFER_DURATION (buffer); + + gst_adapter_push (rtpmpvpay->adapter, buffer); + avail = gst_adapter_available (rtpmpvpay->adapter); + + /* Initialize new RTP payload */ + if (avail == 0) { + rtpmpvpay->first_ts = timestamp; + rtpmpvpay->duration = duration; + } + + /* get packet length of previous data and this new data, + * payload length includes a 4 byte MPEG video-specific header */ + packet_len = gst_rtp_buffer_calc_packet_len (4 + avail, 0, 0); + + if (gst_basertppayload_is_filled (basepayload, + packet_len, rtpmpvpay->duration + duration)) { + ret = gst_rtp_mpv_pay_flush (rtpmpvpay, timestamp, duration); + } else { + if (GST_CLOCK_TIME_IS_VALID (duration)) + rtpmpvpay->duration += duration; + ret = GST_FLOW_OK; + } + return ret; +} + +gboolean +gst_rtp_mpv_pay_plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "rtpmpvpay", + GST_RANK_NONE, GST_TYPE_RTP_MPV_PAY); +} diff --git a/gst/rtp/gstrtpmpvpay.h b/gst/rtp/gstrtpmpvpay.h new file mode 100644 index 0000000000..617de40833 --- /dev/null +++ b/gst/rtp/gstrtpmpvpay.h @@ -0,0 +1,62 @@ +/* GStreamer + * Copyright (C) <2007> Thijs Vermeir + * + * 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_MPV_PAY_H__ +#define __GST_RTP_MPV_PAY_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +typedef struct _GstRTPMPVPay GstRTPMPVPay; +typedef struct _GstRTPMPVPayClass GstRTPMPVPayClass; + +#define GST_TYPE_RTP_MPV_PAY \ + (gst_rtp_mpv_pay_get_type()) +#define GST_RTP_MPV_PAY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MPV_PAY,GstRTPMPVPay)) +#define GST_RTP_MPV_PAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MPV_PAY,GstRTPMPVPayClass)) +#define GST_IS_RTP_MPV_PAY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MPV_PAY)) +#define GST_IS_RTP_MPV_PAY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MPV_PAY)) + +struct _GstRTPMPVPay +{ + GstBaseRTPPayload payload; + + GstAdapter *adapter; + GstClockTime first_ts; + GstClockTime duration; +}; + +struct _GstRTPMPVPayClass +{ + GstBaseRTPPayloadClass parent_class; +}; + +gboolean gst_rtp_mpv_pay_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_RTP_MPV_PAY_H__ */