mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/tag/gsttagdemux.c: Push tag event after the newsegment event. Log the pointer of the buffer we're actual...

Browse source 
Original commit message from CVS:
* gst-libs/gst/tag/gsttagdemux.c: (gst_tag_demux_chain):
Push tag event after the newsegment event. Log the pointer of
the buffer we're actually going to push rather than the buffer
we're feeding to _make_metadata_writable().
This commit is contained in:
Tim-Philipp Müller 2008-02-27 10:23:27 +00:00
parent 929afcbaa1
commit b191c8f609
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-02-27 Tim-Philipp Müller <tim at centricular dot net>
* gst-libs/gst/tag/gsttagdemux.c: (gst_tag_demux_chain):
Push tag event after the newsegment event. Log the pointer of
the buffer we're actually going to push rather than the buffer
we're feeding to _make_metadata_writable().
2008-02-25 Sebastian Dröge <slomo@circular-chaos.org> 2008-02-25 Sebastian Dröge <slomo@circular-chaos.org>
* gst/typefind/gsttypefindfunctions.c: (plugin_init): * gst/typefind/gsttypefindfunctions.c: (plugin_init):

2
common

@ -1 +1 @@
Subproject commit a574e6214b06fcbdfc00e952e2f3edc06997ee93 Subproject commit e746d20ef536a73aea9964666c7d5f6d5c9465df

25
gst-libs/gst/tag/gsttagdemux.c
View file

@ -640,11 +640,6 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf)
case GST_TAG_DEMUX_STREAMING:{ case GST_TAG_DEMUX_STREAMING:{
GstBuffer *outbuf = NULL; GstBuffer *outbuf = NULL;
if (demux->priv->send_tag_event) {
gst_tag_demux_send_tag_event (demux);
demux->priv->send_tag_event = FALSE;
}
/* Trim the buffer and adjust offset */ /* Trim the buffer and adjust offset */
if (demux->priv->collect) { if (demux->priv->collect) {
outbuf = demux->priv->collect; outbuf = demux->priv->collect;
@ -658,14 +653,6 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
GST_DEBUG_OBJECT (demux, "Pushing buffer %p", outbuf);
/* gst_util_dump_mem (GST_BUFFER_DATA (outbuf),
GST_BUFFER_SIZE (outbuf)); */
/* Ensure the caps are set correctly */
outbuf = gst_buffer_make_metadata_writable (outbuf);
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (demux->priv->srcpad));
/* Might need a new segment before the buffer */ /* Might need a new segment before the buffer */
if (demux->priv->need_newseg) { if (demux->priv->need_newseg) {
if (!gst_tag_demux_send_new_segment (demux)) { if (!gst_tag_demux_send_new_segment (demux)) {
@ -675,6 +662,18 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf)
demux->priv->need_newseg = FALSE; demux->priv->need_newseg = FALSE;
} }
/* Send pending tag event */
if (demux->priv->send_tag_event) {
gst_tag_demux_send_tag_event (demux);
demux->priv->send_tag_event = FALSE;
}
/* Ensure the caps are set correctly */
outbuf = gst_buffer_make_metadata_writable (outbuf);
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (demux->priv->srcpad));
GST_LOG_OBJECT (demux, "Pushing buffer %p", outbuf);
return gst_pad_push (demux->priv->srcpad, outbuf); return gst_pad_push (demux->priv->srcpad, outbuf);
} }
} }