mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 23:58:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: don't expose Annodex CMML streams any more

Browse source 
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.
This commit is contained in:
Tim-Philipp Müller 2012-05-12 14:36:09 +01:00
parent 756625edd2
commit 657fe5efff
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/ogg/gstoggdemux.c
View file

@ -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);

1
ext/ogg/gstoggstream.c
View file

@ -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;
}

2
ext/ogg/gstoggstream.h
View file

@ -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;