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

ext/ogg/gstoggdemux.c: Change the pad template to src_%d to match the pads that are created from it. decodebin needs ...

Browse source 
Original commit message from CVS:
* ext/ogg/gstoggdemux.c:
Change the pad template to src_%d to match the pads that
are created from it. decodebin needs this information in order
to decide that oggdemux is capable of producing multiple pads
(and hence needs queues inserted).

* ext/ogg/gstoggmux.c: (gst_ogg_mux_queue_pads),
(gst_ogg_mux_collected):
Make debug output more useful by using GST_PTR_FORMAT.
This commit is contained in:
Jan Schmidt 2006-01-11 18:03:24 +00:00
parent 13e2081f69
commit 08d73c14eb
3 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-01-11 Jan Schmidt <thaytan@mad.scientist.com>
* ext/ogg/gstoggdemux.c:
Change the pad template to src_%d to match the pads that
are created from it. decodebin needs this information in order
to decide that oggdemux is capable of producing multiple pads
(and hence needs queues inserted).
* ext/ogg/gstoggmux.c: (gst_ogg_mux_queue_pads),
(gst_ogg_mux_collected):
Make debug output more useful by using GST_PTR_FORMAT.
2006-01-11 Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com> 2006-01-11 Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
Reviewed by: Tim-Philipp Müller <tim at centricular dot net> Reviewed by: Tim-Philipp Müller <tim at centricular dot net>

2
ext/ogg/gstoggdemux.c
View file

@ -1091,7 +1091,7 @@ enum
}; };
static GstStaticPadTemplate ogg_demux_src_template_factory = static GstStaticPadTemplate ogg_demux_src_template_factory =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src_%d",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY); GST_STATIC_CAPS_ANY);

29
ext/ogg/gstoggmux.c
View file

@ -653,7 +653,8 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
walk = g_slist_next (walk); walk = g_slist_next (walk);
GST_DEBUG_OBJECT (ogg_mux, "looking at pad %p", pad); GST_DEBUG_OBJECT (ogg_mux, "looking at pad %" GST_PTR_FORMAT " (oggpad %p)",
data->pad, pad);
/* try to get a new buffer for this pad if needed and possible */ /* try to get a new buffer for this pad if needed and possible */
if (pad->buffer == NULL) { if (pad->buffer == NULL) {
@ -661,7 +662,7 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
gboolean incaps; gboolean incaps;
buf = gst_collect_pads_pop (ogg_mux->collect, data); buf = gst_collect_pads_pop (ogg_mux->collect, data);
GST_DEBUG_OBJECT (ogg_mux, "popping buffer %p", buf); GST_DEBUG_OBJECT (ogg_mux, "popping buffer %" GST_PTR_FORMAT, buf);
/* On EOS we get a NULL buffer */ /* On EOS we get a NULL buffer */
if (buf != NULL) { if (buf != NULL) {
@ -694,11 +695,14 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
* pull on */ * pull on */
if (pad->buffer) { if (pad->buffer) {
if (gst_ogg_mux_compare_pads (ogg_mux, bestpad, pad) > 0) { if (gst_ogg_mux_compare_pads (ogg_mux, bestpad, pad) > 0) {
GST_DEBUG_OBJECT (ogg_mux, "best pad now %p", pad); GST_DEBUG_OBJECT (ogg_mux, "best pad now %" GST_PTR_FORMAT
" (oggpad %p)", data->pad, pad);
bestpad = pad; bestpad = pad;
} }
} else if (!pad->eos) { } else if (!pad->eos) {
GST_DEBUG_OBJECT (ogg_mux, "hungry pad %p", pad); GST_DEBUG_OBJECT (ogg_mux, "hungry pad %" GST_PTR_FORMAT
" (oggpad %p)", data->pad, pad);
still_hungry = pad; still_hungry = pad;
} }
} }
@ -1022,10 +1026,13 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
/* queue buffers on all pads; find a buffer with the lowest timestamp */ /* queue buffers on all pads; find a buffer with the lowest timestamp */
best = gst_ogg_mux_queue_pads (ogg_mux); best = gst_ogg_mux_queue_pads (ogg_mux);
if (best && !best->buffer) if (best && !best->buffer) {
GST_DEBUG_OBJECT (ogg_mux, "No buffer available on best pad");
return GST_FLOW_OK; return GST_FLOW_OK;
}
GST_DEBUG_OBJECT (ogg_mux, "best pad %p, pulling %p", best, ogg_mux->pulling); GST_DEBUG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT " (oggpad %p)"
" pulling %" GST_PTR_FORMAT, best->collect.pad, best, ogg_mux->pulling);
if (!best) { /* EOS : FIXME !! We need to handle EOS correctly, and set EOS if (!best) { /* EOS : FIXME !! We need to handle EOS correctly, and set EOS
flags on the ogg pages. */ flags on the ogg pages. */
@ -1071,7 +1078,9 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
/* if we don't know which pad to pull on, use the best one */ /* if we don't know which pad to pull on, use the best one */
if (ogg_mux->pulling == NULL) { if (ogg_mux->pulling == NULL) {
ogg_mux->pulling = best; ogg_mux->pulling = best;
GST_DEBUG_OBJECT (ogg_mux, "pulling now %p", ogg_mux->pulling); GST_DEBUG_OBJECT (ogg_mux, "pulling now %" GST_PTR_FORMAT " (oggpad %p)",
ogg_mux->pulling->collect.pad, ogg_mux->pulling);
/* remember timestamp of first buffer for this new pad */ /* remember timestamp of first buffer for this new pad */
if (ogg_mux->pulling != NULL) { if (ogg_mux->pulling != NULL) {
ogg_mux->next_ts = GST_BUFFER_TIMESTAMP (ogg_mux->pulling->buffer); ogg_mux->next_ts = GST_BUFFER_TIMESTAMP (ogg_mux->pulling->buffer);
@ -1092,7 +1101,8 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
gint64 duration; gint64 duration;
gboolean force_flush; gboolean force_flush;
GST_DEBUG_OBJECT (ogg_mux, "pulling now %p", ogg_mux->pulling); GST_DEBUG_OBJECT (ogg_mux, "pulling now %" GST_PTR_FORMAT " (oggpad %p)",
ogg_mux->pulling->collect.pad, ogg_mux->pulling);
/* now see if we have a buffer */ /* now see if we have a buffer */
buf = pad->buffer; buf = pad->buffer;
@ -1237,7 +1247,8 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
*/ */
if (pad->timestamp < timestamp) { if (pad->timestamp < timestamp) {
pad->timestamp = timestamp; pad->timestamp = timestamp;
GST_DEBUG_OBJECT (pad, "Updated timestamp of pad to %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (ogg_mux, "Updated timestamp of pad %" GST_PTR_FORMAT
" (oggpad %p) to %" GST_TIME_FORMAT, pad->collect.pad, pad,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
} }
} }