mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-07 11:12:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: Handle unknown streams

Browse source
This commit is contained in:
David Schleef 2009-11-25 16:53:26 -08:00
parent 8393257732
commit a8e99f80df
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/ogg/gstoggdemux.c
View file

@ -587,8 +587,13 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
gst_ogg_pad_parse_skeleton_fishead (pad, packet); gst_ogg_pad_parse_skeleton_fishead (pad, packet);
} }
pad->have_type = gst_ogg_stream_setup_map (&pad->map, packet); pad->have_type = gst_ogg_stream_setup_map (&pad->map, packet);
if (!pad->have_type) {
pad->map.caps = gst_caps_new_simple ("application/x-unknown", NULL);
}
if (pad->map.caps) { if (pad->map.caps) {
gst_pad_set_caps (GST_PAD (pad), pad->map.caps); gst_pad_set_caps (GST_PAD (pad), pad->map.caps);
} else {
GST_WARNING_OBJECT (ogg, "stream parser didn't create src pad caps");
} }
} }
@ -1439,6 +1444,7 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
/* first add the pads */ /* first add the pads */
for (i = 0; i < chain->streams->len; i++) { for (i = 0; i < chain->streams->len; i++) {
GstOggPad *pad; GstOggPad *pad;
GstStructure *structure;
pad = g_array_index (chain->streams, GstOggPad *, i); pad = g_array_index (chain->streams, GstOggPad *, i);
@ -1452,15 +1458,12 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
pad->map.last_size = 0; pad->map.last_size = 0;
pad->last_ret = GST_FLOW_OK; pad->last_ret = GST_FLOW_OK;
structure = gst_caps_get_structure (GST_PAD_CAPS (pad), 0);
pad->is_sparse = pad->is_sparse =
gst_structure_has_name (gst_caps_get_structure (GST_PAD_CAPS (pad), gst_structure_has_name (structure, "application/x-ogm-text") ||
0), "application/x-ogm-text") || gst_structure_has_name (structure, "text/x-cmml") ||
gst_structure_has_name (gst_caps_get_structure (GST_PAD_CAPS (pad), gst_structure_has_name (structure, "subtitle/x-kate") ||
0), "text/x-cmml") || gst_structure_has_name (structure, "application/x-kate");
gst_structure_has_name (gst_caps_get_structure (GST_PAD_CAPS (pad),
0), "subtitle/x-kate") ||
gst_structure_has_name (gst_caps_get_structure (GST_PAD_CAPS (pad),
0), "application/x-kate");
/* activate first */ /* activate first */
gst_pad_set_active (GST_PAD_CAST (pad), TRUE); gst_pad_set_active (GST_PAD_CAST (pad), TRUE);