diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2005-01-31 10:09:41 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2005-01-31 10:09:41 +0000 |
| commit | dc2d994580d7c45a2bc7418be73c3453117d3674 (patch) | |
| tree | ee8dd33b9d4372459a261a1ecc9d8f5bd0595c6f | |
| parent | 077734c253e95b8ea99e7f26f2a781b256a5524a (diff) | |
| download | gstreamer-plugins-base-dc2d994580d7c45a2bc7418be73c3453117d3674.tar.gz | |
Fix the demuxer again.
Original commit message from CVS:
Fix the demuxer again.
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | ext/ogg/gstoggdemux.c | 12 |
2 files changed, 37 insertions, 0 deletions
@@ -1,3 +1,28 @@ +2005-01-31 Wim Taymans <wim@fluendo.com> + + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_get_type), + (gst_ogg_pad_init), (gst_ogg_pad_dispose), (gst_ogg_pad_src_query), + (gst_ogg_pad_event), (gst_ogg_demux_factory_filter), + (compare_ranks), (gst_ogg_pad_internal_chain), + (gst_ogg_pad_typefind), (gst_ogg_pad_submit_packet), + (gst_ogg_pad_submit_page), (gst_ogg_chain_new), + (gst_ogg_chain_free), (gst_ogg_chain_new_stream), + (gst_ogg_chain_get_stream), (gst_ogg_chain_has_stream), + (gst_ogg_demux_base_init), (gst_ogg_demux_init), + (gst_ogg_demux_submit_buffer), (gst_ogg_demux_seek), + (gst_ogg_demux_get_data), (gst_ogg_demux_get_next_page), + (gst_ogg_demux_get_prev_page), + (gst_ogg_demux_deactivate_current_chain), + (gst_ogg_demux_activate_chain), (gst_ogg_demux_perform_seek), + (gst_ogg_demux_bisect_forward_serialno), + (gst_ogg_demux_read_chain), (gst_ogg_demux_read_end_chain), + (gst_ogg_demux_find_pad), (gst_ogg_demux_find_chain), + (gst_ogg_demux_find_chains), (gst_ogg_demux_chain_unlocked), + (gst_ogg_demux_chain), (gst_ogg_demux_send_eos), + (gst_ogg_demux_loop), (gst_ogg_demux_sink_activate), + (gst_ogg_print): + Fix the demuxer again. + 2005-01-26 Wim Taymans <wim@fluendo.com> * ext/ogg/gstoggdemux.c: (gst_ogg_pad_get_type), diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index c5fbcf7ce..a53a6f625 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -630,7 +630,10 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet) if (pad->packetno == 0) { gst_ogg_pad_typefind (pad, packet); } +#if 0 if (ogg->state != OGG_STATE_STREAMING) { + GST_DEBUG_OBJECT (ogg, "%p collecting headers, state %d", pad, ogg->state); + buf = gst_buffer_new_and_alloc (packet->bytes); memcpy (GST_BUFFER_DATA (buf), packet->packet, packet->bytes); gst_buffer_set_caps (buf, GST_PAD_CAPS (pad)); @@ -642,6 +645,7 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet) goto done; } +#endif /* stream packet to peer plugin */ if (pad->mode == GST_OGG_PAD_MODE_STREAMING) { @@ -649,6 +653,10 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet) gst_pad_alloc_buffer (GST_PAD (pad), GST_BUFFER_OFFSET_NONE, packet->bytes, GST_PAD_CAPS (pad)); + GST_DEBUG_OBJECT (ogg, + "%p streaming to peer serial %08lx, packetno %lld", pad, pad->serialno, + pad->packetno); + if (pad->new_segment) { ret = gst_pad_push_event (GST_PAD (pad), pad->new_segment); pad->new_segment = NULL; @@ -661,6 +669,10 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet) GST_BUFFER_OFFSET_END (buf) = packet->granulepos; ret = gst_pad_push (GST_PAD (pad), buf); + } else { + GST_DEBUG_OBJECT (ogg, + "%p could not get buffer from peer %08lx, packetno %lld", pad, + pad->serialno, pad->packetno); } } else { /* initialize our internal decoder with packets */ |