gst/rtp/: Added simple generic mpeg4 depayloader.

Original commit message from CVS:
* gst/rtp/Makefile.am:
* gst/rtp/gstrtp.c: (plugin_init):
* gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_base_init),
(gst_rtp_mp4g_depay_class_init), (gst_rtp_mp4g_depay_init),
(gst_rtp_mp4g_depay_setcaps), (gst_rtp_mp4g_depay_process),
(gst_rtp_mp4g_depay_set_property),
(gst_rtp_mp4g_depay_get_property),
(gst_rtp_mp4g_depay_change_state),
(gst_rtp_mp4g_depay_plugin_init):
* gst/rtp/gstrtpmp4gdepay.h:
* gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_class_init),
(gst_rtp_mp4g_pay_parse_audio_config), (gst_rtp_mp4g_pay_setcaps),
(gst_rtp_mp4g_pay_flush):
Added simple generic mpeg4 depayloader.
Fix generic mpeg4 payloader.

ChangeLog

@@ -1,3 +1,21 @@
+2006-07-16  Wim Taymans  <wim@fluendo.com>
+
+	* gst/rtp/Makefile.am:
+	* gst/rtp/gstrtp.c: (plugin_init):
+	* gst/rtp/gstrtpmp4gdepay.c: (gst_rtp_mp4g_depay_base_init),
+	(gst_rtp_mp4g_depay_class_init), (gst_rtp_mp4g_depay_init),
+	(gst_rtp_mp4g_depay_setcaps), (gst_rtp_mp4g_depay_process),
+	(gst_rtp_mp4g_depay_set_property),
+	(gst_rtp_mp4g_depay_get_property),
+	(gst_rtp_mp4g_depay_change_state),
+	(gst_rtp_mp4g_depay_plugin_init):
+	* gst/rtp/gstrtpmp4gdepay.h:
+	* gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_class_init),
+	(gst_rtp_mp4g_pay_parse_audio_config), (gst_rtp_mp4g_pay_setcaps),
+	(gst_rtp_mp4g_pay_flush):
+	Added simple generic mpeg4 depayloader.
+	Fix generic mpeg4 payloader.
+
 2006-07-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_set_state):

gst/rtp/Makefile.am

@@ -20,6 +20,7 @@ libgstrtp_la_SOURCES = \
 	gstrtpmp2tdepay.c \
 	gstrtpmp4vdepay.c \
 	gstrtpmp4vpay.c \
+	gstrtpmp4gdepay.c \
 	gstrtpmp4gpay.c \
 	gstrtpspeexdepay.c \
 	gstrtpspeexpay.c
@@ -56,6 +57,7 @@ noinst_HEADERS =			\
 		 gstrtpmp2tdepay.h 	\
 		 gstrtpmp4vdepay.h	\
 		 gstrtpmp4vpay.h	\
+		 gstrtpmp4gdepay.h 	\
 		 gstrtpmp4gpay.h	\
 		 gstrtpdepay.h		\
 		 gstasteriskh263.h	\

gst/rtp/gstrtp.c

@@ -37,9 +37,10 @@
 #include "gstrtph263pay.h"
 #include "gstasteriskh263.h"
 #include "gstrtpmp2tdepay.h"
-#include "gstrtpmp4vpay.h"
-#include "gstrtpmp4gpay.h"
 #include "gstrtpmp4vdepay.h"
+#include "gstrtpmp4vpay.h"
+#include "gstrtpmp4gdepay.h"
+#include "gstrtpmp4gpay.h"
 #include "gstrtpspeexpay.h"
 #include "gstrtpspeexdepay.h"
 
@@ -100,6 +101,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_rtp_mp4v_depay_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_rtp_mp4g_depay_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_rtp_mp4g_pay_plugin_init (plugin))
     return FALSE;
 

gst/rtp/gstrtpmp4gdepay.c

@@ -0,0 +1,382 @@
+/* GStreamer
+ * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include <gst/rtp/gstrtpbuffer.h>
+
+#include <string.h>
+#include "gstrtpmp4gdepay.h"
+
+GST_DEBUG_CATEGORY_STATIC (rtpmp4gdepay_debug);
+#define GST_CAT_DEFAULT (rtpmp4gdepay_debug)
+
+/* elementfactory information */
+static const GstElementDetails gst_rtp_mp4gdepay_details =
+GST_ELEMENT_DETAILS ("RTP packet parser",
+    "Codec/Depay/Network",
+    "Extracts MPEG4 elementary streams from RTP packets (RFC 3640)",
+    "Wim Taymans <wim@fluendo.com>");
+
+/* RtpMP4GDepay signals and args */
+enum
+{
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+enum
+{
+  ARG_0,
+  ARG_FREQUENCY
+};
+
+static GstStaticPadTemplate gst_rtp_mp4g_depay_src_template =
+    GST_STATIC_PAD_TEMPLATE ("src",
+    GST_PAD_SRC,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/mpeg,"
+        "mpegversion=(int) 4,"
+        "systemstream=(boolean)false;" "audio/mpeg," "mpegversion=(int) 4")
+    );
+
+static GstStaticPadTemplate gst_rtp_mp4g_depay_sink_template =
+GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("application/x-rtp, "
+        "media = (string) { \"video\", \"audio\", \"application\" }, "
+        "payload = (int) [ 96, 127 ], "
+        "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], "
+        /* "config = (string) [1,MAX]" */
+        "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], "
+        /* 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]")
+    );
+
+GST_BOILERPLATE (GstRtpMP4GDepay, gst_rtp_mp4g_depay, GstBaseRTPDepayload,
+    GST_TYPE_BASE_RTP_DEPAYLOAD);
+
+static gboolean gst_rtp_mp4g_depay_setcaps (GstBaseRTPDepayload * depayload,
+    GstCaps * caps);
+static GstBuffer *gst_rtp_mp4g_depay_process (GstBaseRTPDepayload * depayload,
+    GstBuffer * buf);
+
+static void gst_rtp_mp4g_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_rtp_mp4g_depay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static GstStateChangeReturn gst_rtp_mp4g_depay_change_state (GstElement *
+    element, GstStateChange transition);
+
+
+static void
+gst_rtp_mp4g_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_mp4g_depay_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_rtp_mp4g_depay_sink_template));
+
+  gst_element_class_set_details (element_class, &gst_rtp_mp4gdepay_details);
+}
+
+static void
+gst_rtp_mp4g_depay_class_init (GstRtpMP4GDepayClass * 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_mp4g_depay_process;
+  gstbasertpdepayload_class->set_caps = gst_rtp_mp4g_depay_setcaps;
+
+  gobject_class->set_property = gst_rtp_mp4g_depay_set_property;
+  gobject_class->get_property = gst_rtp_mp4g_depay_get_property;
+
+  gstelement_class->change_state = gst_rtp_mp4g_depay_change_state;
+
+  GST_DEBUG_CATEGORY_INIT (rtpmp4gdepay_debug, "rtpmp4gdepay", 0,
+      "MP4-generic RTP Depayloader");
+}
+
+static void
+gst_rtp_mp4g_depay_init (GstRtpMP4GDepay * rtpmp4gdepay,
+    GstRtpMP4GDepayClass * klass)
+{
+}
+
+static gboolean
+gst_rtp_mp4g_depay_setcaps (GstBaseRTPDepayload * depayload, GstCaps * caps)
+{
+
+  GstStructure *structure;
+  GstRtpMP4GDepay *rtpmp4gdepay;
+  GstCaps *srccaps = NULL;
+  const gchar *str;
+  gint clock_rate = 90000;      /* default */
+  gint someint;
+
+  rtpmp4gdepay = GST_RTP_MP4G_DEPAY (depayload);
+
+  structure = gst_caps_get_structure (caps, 0);
+
+  gst_structure_get_int (structure, "clock-rate", &clock_rate);
+  depayload->clock_rate = clock_rate;
+
+  if ((str = gst_structure_get_string (structure, "media"))) {
+    if (strcmp (str, "audio") == 0) {
+      srccaps = gst_caps_new_simple ("audio/mpeg",
+          "mpegversion", G_TYPE_INT, 4, NULL);
+    } else if (strcmp (str, "video") == 0) {
+      srccaps = gst_caps_new_simple ("video/mpeg",
+          "mpegversion", G_TYPE_INT, 4,
+          "systemstream", G_TYPE_BOOLEAN, FALSE, NULL);
+    }
+  }
+  if (srccaps == NULL)
+    goto unknown_media;
+
+  /* these values are optional and have a default value of 0 (no header) */
+  if (!gst_structure_get_int (structure, "sizelength", &someint))
+    someint = 0;
+  rtpmp4gdepay->sizelength = someint;
+
+  if (!gst_structure_get_int (structure, "indexlength", &someint))
+    someint = 0;
+  rtpmp4gdepay->indexlength = someint;
+
+  if (!gst_structure_get_int (structure, "indexlength", &someint))
+    someint = 0;
+  rtpmp4gdepay->indexdeltalength = someint;
+
+  if (!gst_structure_get_int (structure, "ctsdeltalength", &someint))
+    someint = 0;
+  rtpmp4gdepay->ctsdeltalength = someint;
+
+  if (!gst_structure_get_int (structure, "dtsdeltalength", &someint))
+    someint = 0;
+  rtpmp4gdepay->dtsdeltalength = someint;
+
+  if (!gst_structure_get_int (structure, "randomaccessindication", &someint))
+    someint = 0;
+  rtpmp4gdepay->randomaccessindication = someint > 0 ? 1 : 0;
+
+  if (!gst_structure_get_int (structure, "streamstateindication", &someint))
+    someint = 0;
+  rtpmp4gdepay->streamstateindication = someint;
+
+  if (!gst_structure_get_int (structure, "auxiliarydatasizelength", &someint))
+    someint = 0;
+  rtpmp4gdepay->auxiliarydatasizelength = someint;
+
+  /* get config string */
+  if ((str = gst_structure_get_string (structure, "config"))) {
+    GValue v = { 0 };
+
+    g_value_init (&v, GST_TYPE_BUFFER);
+    if (gst_value_deserialize (&v, str)) {
+      GstBuffer *buffer;
+
+      buffer = gst_value_get_buffer (&v);
+      gst_buffer_ref (buffer);
+      g_value_unset (&v);
+
+      gst_caps_set_simple (srccaps,
+          "codec_data", GST_TYPE_BUFFER, buffer, NULL);
+    } else {
+      g_warning ("cannot convert config to buffer");
+    }
+  }
+
+  gst_pad_set_caps (depayload->srcpad, srccaps);
+  gst_caps_unref (srccaps);
+
+  return TRUE;
+
+  /* ERRORS */
+unknown_media:
+  {
+    GST_DEBUG_OBJECT (rtpmp4gdepay, "Unknown media type");
+    return FALSE;
+  }
+}
+
+static GstBuffer *
+gst_rtp_mp4g_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf)
+{
+  GstRtpMP4GDepay *rtpmp4gdepay;
+  GstBuffer *outbuf;
+
+  rtpmp4gdepay = GST_RTP_MP4G_DEPAY (depayload);
+
+  if (!gst_rtp_buffer_validate (buf))
+    goto bad_packet;
+
+  {
+    gint payload_len;
+    guint8 *payload;
+    guint32 timestamp;
+
+    payload_len = gst_rtp_buffer_get_payload_len (buf);
+    payload = gst_rtp_buffer_get_payload (buf);
+
+    /* skip header */
+    payload += 4;
+    payload_len -= 4;
+
+    timestamp = gst_rtp_buffer_get_timestamp (buf);
+
+    outbuf = gst_buffer_new_and_alloc (payload_len);
+    memcpy (GST_BUFFER_DATA (outbuf), payload, payload_len);
+
+    gst_adapter_push (rtpmp4gdepay->adapter, outbuf);
+
+    /* if this was the last packet of the VOP, create and push a buffer */
+    if (gst_rtp_buffer_get_marker (buf)) {
+      guint avail;
+
+      avail = gst_adapter_available (rtpmp4gdepay->adapter);
+
+      outbuf = gst_buffer_new ();
+      GST_BUFFER_SIZE (outbuf) = avail;
+      GST_BUFFER_MALLOCDATA (outbuf) =
+          gst_adapter_take (rtpmp4gdepay->adapter, avail);
+      GST_BUFFER_DATA (outbuf) = GST_BUFFER_MALLOCDATA (outbuf);
+      gst_buffer_set_caps (outbuf, GST_PAD_CAPS (depayload->srcpad));
+      GST_BUFFER_TIMESTAMP (outbuf) =
+          timestamp * GST_SECOND / depayload->clock_rate;
+
+      GST_DEBUG ("gst_rtp_mp4g_depay_chain: pushing buffer of size %d",
+          GST_BUFFER_SIZE (outbuf));
+
+      return outbuf;
+    } else {
+      return NULL;
+    }
+  }
+
+  return NULL;
+
+bad_packet:
+  {
+    GST_ELEMENT_WARNING (rtpmp4gdepay, STREAM, DECODE,
+        ("Packet did not validate"), (NULL));
+
+    return NULL;
+  }
+}
+
+static void
+gst_rtp_mp4g_depay_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstRtpMP4GDepay *rtpmp4gdepay;
+
+  rtpmp4gdepay = GST_RTP_MP4G_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_rtp_mp4g_depay_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstRtpMP4GDepay *rtpmp4gdepay;
+
+  rtpmp4gdepay = GST_RTP_MP4G_DEPAY (object);
+
+  switch (prop_id) {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static GstStateChangeReturn
+gst_rtp_mp4g_depay_change_state (GstElement * element,
+    GstStateChange transition)
+{
+  GstRtpMP4GDepay *rtpmp4gdepay;
+  GstStateChangeReturn ret;
+
+  rtpmp4gdepay = GST_RTP_MP4G_DEPAY (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      rtpmp4gdepay->adapter = gst_adapter_new ();
+      break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_adapter_clear (rtpmp4gdepay->adapter);
+      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 (rtpmp4gdepay->adapter);
+      rtpmp4gdepay->adapter = NULL;
+      break;
+    default:
+      break;
+  }
+  return ret;
+}
+
+gboolean
+gst_rtp_mp4g_depay_plugin_init (GstPlugin * plugin)
+{
+  return gst_element_register (plugin, "rtpmp4gdepay",
+      GST_RANK_NONE, GST_TYPE_RTP_MP4G_DEPAY);
+}

gst/rtp/gstrtpmp4gdepay.h

@@ -0,0 +1,70 @@
+/* GStreamer
+ * Copyright (C) <2005> Wim Taymans <wim@fluendo.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_RTP_MP4G_DEPAY_H__
+#define __GST_RTP_MP4G_DEPAY_H__
+
+#include <gst/gst.h>
+#include <gst/base/gstadapter.h>
+#include <gst/rtp/gstbasertpdepayload.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_RTP_MP4G_DEPAY \
+  (gst_rtp_mp4g_depay_get_type())
+#define GST_RTP_MP4G_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_RTP_MP4G_DEPAY,GstRtpMP4GDepay))
+#define GST_RTP_MP4G_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_RTP_MP4G_DEPAY,GstRtpMP4GDepayClass))
+#define GST_IS_RTP_MP4G_DEPAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_RTP_MP4G_DEPAY))
+#define GST_IS_RTP_MP4G_DEPAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTP_MP4G_DEPAY))
+
+typedef struct _GstRtpMP4GDepay GstRtpMP4GDepay;
+typedef struct _GstRtpMP4GDepayClass GstRtpMP4GDepayClass;
+
+struct _GstRtpMP4GDepay
+{
+  GstBaseRTPDepayload depayload;
+
+  gint profile_level_id;
+  gint streamtype;
+  gint sizelength;
+  gint indexlength;
+  gint indexdeltalength;
+  gint ctsdeltalength;
+  gint dtsdeltalength;
+  gint randomaccessindication;
+  gint streamstateindication;
+  gint auxiliarydatasizelength;
+  
+  GstAdapter *adapter;
+};
+
+struct _GstRtpMP4GDepayClass
+{
+  GstBaseRTPDepayloadClass parent_class;
+};
+
+gboolean gst_rtp_mp4g_depay_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_RTP_MP4G_DEPAY_H__ */

gst/rtp/gstrtpmp4gpay.c

@@ -51,12 +51,12 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-rtp, "
-        "media = (string) \"video\", "
+        "media = (string) { \"video\", \"audio\", \"application\" }, "
         "payload = (int) [ 96, 127 ], "
         "clock-rate = (int) [1, MAX ], "
         "encoding-name = (string) \"mpeg4-generic\", "
         /* required string params */
-        "streamtype = (string) { \"4\", \"5\" }, "      /* 4 = video, 5 = audio */
+        "streamtype = (int) { \"4\", \"5\" }, " /* 4 = video, 5 = audio */
         "profile-level-id = (int) [1,MAX], "
         /* "config = (string) [1,MAX]" */
         "mode = (string) { \"generic\", \"CELP-cbr\", \"CELP-vbr\", \"AAC-lbr\", \"AAC-hbr\" }, "
@@ -64,7 +64,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
         "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], "
+        "de-interleavebuffersize = (int) [1,MAX], "
         /* Optional configuration parameters */
         "sizelength = (int) [1, 16], "  /* max 16 bits, should be enough... */
         "indexlength = (int) [1, 8], "
@@ -160,7 +160,6 @@ gst_rtp_mp4g_pay_class_init (GstRtpMP4GPayClass * klass)
 
   GST_DEBUG_CATEGORY_INIT (rtpmp4gpay_debug, "rtpmp4gpay", 0,
       "MP4-generic RTP Payloader");
-
 }
 
 static void
@@ -237,7 +236,7 @@ gst_rtp_mp4g_pay_parse_audio_config (GstRtpMP4GPay * rtpmp4gpay,
   /* audio stream type */
   rtpmp4gpay->streamtype = 5;
   /* mode */
-  rtpmp4gpay->mode = "ACC-hbr";
+  rtpmp4gpay->mode = "AAC-hbr";
   /* profile (should be 1) */
   rtpmp4gpay->profile = objectType - 1;
 
@@ -363,7 +362,7 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
   GstRtpMP4GPay *rtpmp4gpay;
   GstStructure *structure;
   const GValue *codec_data;
-  gboolean res = TRUE;
+  gchar *media_type = NULL;
 
   rtpmp4gpay = GST_RTP_MP4G_PAY (payload);
 
@@ -375,6 +374,7 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
     if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) {
       GstBuffer *buffer;
       const gchar *name;
+      gboolean res;
 
       buffer = gst_value_get_buffer (codec_data);
       GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data");
@@ -384,8 +384,10 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
       /* parse buffer */
       if (!strcmp (name, "audio/mpeg")) {
         res = gst_rtp_mp4g_pay_parse_audio_config (rtpmp4gpay, buffer);
+        media_type = "audio";
       } else if (!strcmp (name, "video/mpeg")) {
         res = gst_rtp_mp4g_pay_parse_video_config (rtpmp4gpay, buffer);
+        media_type = "video";
       } else {
         res = FALSE;
       }
@@ -399,13 +401,15 @@ gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps)
       rtpmp4gpay->config = gst_buffer_copy (buffer);
     }
   }
+  if (media_type == NULL)
+    goto config_failed;
 
-  gst_basertppayload_set_options (payload, "video", TRUE, "mpeg4-generic",
+  gst_basertppayload_set_options (payload, media_type, TRUE, "mpeg4-generic",
       rtpmp4gpay->rate);
 
   gst_rtp_mp4g_pay_new_caps (rtpmp4gpay);
 
-  return res;
+  return TRUE;
 
   /* ERRORS */
 config_failed:
@@ -503,7 +507,7 @@ gst_rtp_mp4g_pay_flush (GstRtpMP4GPay * rtpmp4gpay)
     gst_adapter_flush (rtpmp4gpay->adapter, payload_len);
 
     /* marker only if the packet is complete */
-    gst_rtp_buffer_set_marker (outbuf, avail > payload_len);
+    gst_rtp_buffer_set_marker (outbuf, avail <= payload_len);
 
     GST_BUFFER_TIMESTAMP (outbuf) = rtpmp4gpay->first_ts;