From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sat, 12 May 2012 13:36:09 +0000 (+0100)
Subject: oggdemux: don't expose Annodex CMML streams any more
X-Git-Tag: RELEASE-0.11.92~132
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=657fe5efffcd7b85fe73fd2b40a561b600fcbb8b;p=platform%2Fupstream%2Fgst-plugins-base.git

oggdemux: don't expose Annodex CMML streams any more

This never really took off - it's hardly used anywhere
and deprecated in favour of Kate. Exposing pads just
leads to confusing 'you are missing a plug-in' messages
when people come across such streams. We could still post
the data on the bus for applications to parse.
---

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 646fe86ac..e9d19e2b2 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2549,7 +2549,7 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
     gst_ogg_pad_mark_discont (pad);
     pad->last_ret = GST_FLOW_OK;
 
-    if (pad->map.is_skeleton || pad->added
+    if (pad->map.is_skeleton || pad->map.is_cmml || pad->added
         || !gst_pad_has_current_caps (GST_PAD_CAST (pad)))
       continue;
 
@@ -2870,7 +2870,7 @@ gst_ogg_demux_do_seek (GstOggDemux * ogg, GstSegment * segment,
     if (pad == NULL)
       continue;
 
-    if (pad->map.is_skeleton)
+    if (pad->map.is_skeleton || pad->map.is_cmml)
       goto next;
 
     granulepos = ogg_page_granulepos (&og);
diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
index 460f507f8..2190b2706 100644
--- a/ext/ogg/gstoggstream.c
+++ b/ext/ogg/gstoggstream.c
@@ -1717,6 +1717,7 @@ setup_cmml_mapper (GstOggStream * pad, ogg_packet * packet)
   pad->caps = gst_caps_new_empty_simple ("text/x-cmml");
   pad->always_flush_page = TRUE;
   pad->is_sparse = TRUE;
+  pad->is_cmml = TRUE;
 
   return TRUE;
 }
diff --git a/ext/ogg/gstoggstream.h b/ext/ogg/gstoggstream.h
index c06bc51d6..b7353a6fc 100644
--- a/ext/ogg/gstoggstream.h
+++ b/ext/ogg/gstoggstream.h
@@ -96,6 +96,8 @@ struct _GstOggStream
   /* OGM stuff */
   gboolean is_ogm;
   gboolean is_ogm_text;
+  /* CMML */
+  gboolean is_cmml;
   /* fishead stuff */
   guint16 skeleton_major, skeleton_minor;
   gint64 prestime;