mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggmux: keep IN_CAPS flag check for header buffers as fallback

Browse source 
In case the ogg mapper doesn't handle all the accepted input formats
(although it really should). Saves us error handling for that case
though. Also log caps properly.

https://bugzilla.gnome.org/show_bug.cgi?id=629196
This commit is contained in:
Tim-Philipp Müller 2011-02-02 17:23:43 +00:00
parent 440002a137
commit 2eac43bd73
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ext/ogg/gstoggmux.c
View file

@ -775,25 +775,34 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
if (pad->state == GST_OGG_PAD_STATE_CONTROL) { if (pad->state == GST_OGG_PAD_STATE_CONTROL) {
/* and we have one */ /* and we have one */
ogg_packet packet; ogg_packet packet;
gboolean is_header;
packet.packet = GST_BUFFER_DATA (buf); packet.packet = GST_BUFFER_DATA (buf);
packet.bytes = GST_BUFFER_SIZE (buf); packet.bytes = GST_BUFFER_SIZE (buf);
if (GST_BUFFER_OFFSET_END_IS_VALID (buf))
packet.granulepos = GST_BUFFER_OFFSET_END (buf); packet.granulepos = GST_BUFFER_OFFSET_END (buf);
if (packet.granulepos == -1) else
packet.granulepos = 0; packet.granulepos = 0;
/* if we're not yet in data mode, ensure we're setup on the first packet */ /* if we're not yet in data mode, ensure we're setup on the first packet */
if (!pad->have_type) { if (!pad->have_type) {
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) { if (!pad->have_type) {
pad->map.caps = GST_ERROR_OBJECT (pad, "mapper didn't recognise input stream "
gst_caps_new_simple ("application/x-unknown", NULL); "(pad caps: %" GST_PTR_FORMAT ")", GST_PAD_CAPS (pad));
} else {
GST_DEBUG_OBJECT (pad, "caps detected: %" GST_PTR_FORMAT,
pad->map.caps);
} }
GST_DEBUG_OBJECT (ogg_mux, "New pad has caps: %s",
gst_caps_to_string (pad->map.caps));
} }
if (pad->have_type)
is_header = gst_ogg_stream_packet_is_header (&pad->map, &packet);
else /* fallback (FIXME 0.11: remove IN_CAPS hack) */
is_header = GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_IN_CAPS);
if (gst_ogg_stream_packet_is_header (&pad->map, &packet)) { if (is_header) {
GST_DEBUG_OBJECT (ogg_mux, GST_DEBUG_OBJECT (ogg_mux,
"got header buffer in control state, ignoring"); "got header buffer in control state, ignoring");
/* just ignore */ /* just ignore */