From 0671b2325e7b4256d474283b4d4fb1f3c9ea0169 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Thu, 21 Apr 2011 22:51:52 +0100
Subject: [PATCH] quicktime: register 3gppmux element in addition to the
 misnamed gppmux

---
 gst/quicktime/gstqtmux.c    |  7 ++++---
 gst/quicktime/gstqtmuxmap.c | 21 ++++++++++++++++++++-
 gst/quicktime/gstqtmuxmap.h |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/gst/quicktime/gstqtmux.c b/gst/quicktime/gstqtmux.c
index 0bfbd97..0b52e50 100644
--- a/gst/quicktime/gstqtmux.c
+++ b/gst/quicktime/gstqtmux.c
@@ -249,8 +249,9 @@ gst_qt_mux_base_init (gpointer g_class)
 
   /* construct the element details struct */
   longname = g_strdup_printf ("%s Muxer", params->prop->long_name);
-  description = g_strdup_printf ("Multiplex audio and video into a %s file",
-      params->prop->long_name);
+  description = g_strdup_printf ("Multiplex audio and video into a %s file%s",
+      params->prop->long_name,
+      (params->prop->rank == GST_RANK_NONE) ? " (deprecated)" : "");
   gst_element_class_set_details_simple (element_class, longname,
       "Codec/Muxer", description,
       "Thiago Sousa Santos <thiagoss@embedded.ufcg.edu.br>");
@@ -3501,7 +3502,7 @@ gst_qt_mux_register (GstPlugin * plugin)
     g_type_add_interface_static (type, GST_TYPE_TAG_XMP_WRITER,
         &tag_xmp_writer_info);
 
-    if (!gst_element_register (plugin, prop->name, GST_RANK_PRIMARY, type))
+    if (!gst_element_register (plugin, prop->name, prop->rank, type))
       return FALSE;
 
     i++;
diff --git a/gst/quicktime/gstqtmuxmap.c b/gst/quicktime/gstqtmuxmap.c
index a14367e..c3a0295 100644
--- a/gst/quicktime/gstqtmuxmap.c
+++ b/gst/quicktime/gstqtmuxmap.c
@@ -147,6 +147,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
   /* original QuickTime format; see Apple site (e.g. qtff.pdf) */
   {
         GST_QT_MUX_FORMAT_QT,
+        GST_RANK_PRIMARY,
         "qtmux",
         "QuickTime",
         "GstQTMux",
@@ -180,6 +181,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
    * (supersedes original ISO 144996-1 mp41) */
   {
         GST_QT_MUX_FORMAT_MP4,
+        GST_RANK_PRIMARY,
         "mp4mux",
         "MP4",
         "GstMP4Mux",
@@ -193,6 +195,7 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
   /* TODO add WMV/WMA support */
   {
         GST_QT_MUX_FORMAT_ISML,
+        GST_RANK_PRIMARY,
         "ismlmux",
         "ISML",
         "GstISMLMux",
@@ -205,6 +208,21 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
    * (extended in 3GPP2 File Formats for Multimedia Services) */
   {
         GST_QT_MUX_FORMAT_3GP,
+        GST_RANK_PRIMARY,
+        "3gppmux",
+        "3GPP",
+        "Gst3GPPMux",
+        GST_STATIC_CAPS ("video/quicktime, variant = (string) 3gpp"),
+        GST_STATIC_CAPS (H263_CAPS "; " MPEG4V_CAPS "; " H264_CAPS),
+        GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
+      }
+  ,
+#ifndef GST_REMOVE_DEPRECATED
+  /* 3GPP Technical Specification 26.244 V7.3.0
+   * (extended in 3GPP2 File Formats for Multimedia Services) */
+  {
+        GST_QT_MUX_FORMAT_3GP,
+        GST_RANK_NONE,
         "gppmux",
         "3GPP",
         "GstGPPMux",
@@ -213,9 +231,11 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
         GST_STATIC_CAPS (AMR_CAPS "; " MP3_CAPS "; " AAC_CAPS)
       }
   ,
+#endif
   /* ISO 15444-3: Motion-JPEG-2000 (also ISO base media extension) */
   {
         GST_QT_MUX_FORMAT_MJ2,
+        GST_RANK_PRIMARY,
         "mj2mux",
         "MJ2",
         "GstMJ2Mux",
@@ -228,7 +248,6 @@ GstQTMuxFormatProp gst_qt_mux_format_list[] = {
   {
         GST_QT_MUX_FORMAT_NONE,
       }
-  ,
 };
 
 /* pretty static, but may turn out needed a few times */
diff --git a/gst/quicktime/gstqtmuxmap.h b/gst/quicktime/gstqtmuxmap.h
index 767d62a..f069a2f 100644
--- a/gst/quicktime/gstqtmuxmap.h
+++ b/gst/quicktime/gstqtmuxmap.h
@@ -62,6 +62,7 @@ typedef enum _GstQTMuxFormat
 typedef struct _GstQTMuxFormatProp
 {
   GstQTMuxFormat format;
+  GstRank rank;
   const gchar *name;
   const gchar *long_name;
   const gchar *type_name;
-- 
2.7.4