From 67d4bcd555dcab6ce38481deecc1c0179915d268 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sun, 25 Nov 2007 10:45:09 +0000 Subject: [PATCH] gst/flv/gstflvparse.c: Output segment with proper 'stop' value, makes flvdemux 100% compatible with gnonlin. Original commit message from CVS: * gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio), (gst_flv_parse_tag_video): Output segment with proper 'stop' value, makes flvdemux 100% compatible with gnonlin. --- ChangeLog | 7 +++++++ gst/flv/gstflvparse.c | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07652e1a95..a8e0dd67ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-11-25 Edward Hervey + + * gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio), + (gst_flv_parse_tag_video): + Output segment with proper 'stop' value, makes flvdemux 100% compatible + with gnonlin. + 2007-11-25 Stefan Kost * ext/dc1394/gstdc1394.c: diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c index 87a63f5076..3e17de9d2c 100644 --- a/gst/flv/gstflvparse.c +++ b/gst/flv/gstflvparse.c @@ -610,10 +610,12 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data, if (!demux->new_seg_event) { GST_DEBUG_OBJECT (demux, "pushing newsegment from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT, - GST_TIME_ARGS (demux->segment->last_stop), GST_TIME_ARGS (-1)); - demux->new_seg_event = gst_event_new_new_segment (FALSE, - demux->segment->rate, demux->segment->format, - demux->segment->last_stop, -1, demux->segment->last_stop); + GST_TIME_ARGS (demux->segment->last_stop), + GST_TIME_ARGS (demux->segment->stop)); + demux->new_seg_event = + gst_event_new_new_segment (FALSE, demux->segment->rate, + demux->segment->format, demux->segment->last_stop, + demux->segment->stop, demux->segment->last_stop); } else { GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event"); } @@ -865,10 +867,12 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data, if (!demux->new_seg_event) { GST_DEBUG_OBJECT (demux, "pushing newsegment from %" GST_TIME_FORMAT " to %" GST_TIME_FORMAT, - GST_TIME_ARGS (demux->segment->last_stop), GST_TIME_ARGS (-1)); - demux->new_seg_event = gst_event_new_new_segment (FALSE, - demux->segment->rate, demux->segment->format, - demux->segment->last_stop, -1, demux->segment->last_stop); + GST_TIME_ARGS (demux->segment->last_stop), + GST_TIME_ARGS (demux->segment->stop)); + demux->new_seg_event = + gst_event_new_new_segment (FALSE, demux->segment->rate, + demux->segment->format, demux->segment->last_stop, + demux->segment->stop, demux->segment->last_stop); } else { GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event"); }