diff --git a/ChangeLog b/ChangeLog index 624dd527f6..705975ff9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-10-11 Wim Taymans + + * ext/mad/gstid3tag.c: (gst_id3_tag_sink_event): + * ext/mad/gstmad.c: (gst_mad_chain): + * gst/mpegaudioparse/gstmpegaudioparse.c: + (gst_mp3parse_sink_event), (gst_mp3parse_chain): + * gst/realmedia/rmdemux.c: (gst_rmdemux_perform_seek), + (gst_rmdemux_chain), (gst_rmdemux_add_stream): + newsegment API update. + 2005-10-06 Wim Taymans * ext/amrnb/amrnbdec.c: diff --git a/common b/common index 7d175466d3..615cf4d450 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7d175466d3319fe55327608ea1f7a20619ab5634 +Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44 diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index 375ecb1ea4..0e4f6fc2b0 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -795,8 +795,8 @@ gst_id3_tag_sink_event (GstPad * pad, GstEvent * event) GstFormat format = GST_FORMAT_UNDEFINED; gint64 value, end_value; - gst_event_parse_newsegment (event, NULL, &format, &value, &end_value, - NULL); + gst_event_parse_newsegment (event, NULL, NULL, &format, &value, + &end_value, NULL); if (format == GST_FORMAT_BYTES || format == GST_FORMAT_DEFAULT) { if (value != @@ -845,15 +845,15 @@ gst_id3_tag_sink_event (GstPad * pad, GstEvent * event) gdouble rate; gint64 value, end_value, base; - gst_event_parse_newsegment (event, &rate, &format, &value, &end_value, - &base); + gst_event_parse_newsegment (event, NULL, &rate, &format, &value, + &end_value, &base); if (format == GST_FORMAT_BYTES || format == GST_FORMAT_DEFAULT) { if (value > tag->v2tag_size) { value -= tag->v2tag_size; gst_event_unref (event); event = - gst_event_new_newsegment (rate, format, value, end_value, - base); + gst_event_new_newsegment (FALSE, rate, format, value, + end_value, base); } } if (tag->srcpad) diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 216306fedd..4a87957dcf 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -1491,10 +1491,11 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer) if (do_send_discont) { gst_pad_push_event (mad->srcpad, - gst_event_new_newsegment (1.0, GST_FORMAT_TIME, + gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (outbuffer), GST_CLOCK_TIME_NONE, 0)); do_send_discont = FALSE; } + result = gst_pad_push (mad->srcpad, outbuffer); if (result != GST_FLOW_OK) { goto end; diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index f7d0099db2..16e7a34071 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -293,7 +293,7 @@ gst_mp3parse_sink_event (GstPad * pad, GstEvent * event) { GstFormat format; - gst_event_parse_newsegment (event, NULL, &format, NULL, NULL, NULL); + gst_event_parse_newsegment (event, NULL, NULL, &format, NULL, NULL, NULL); if (format != GST_FORMAT_TIME) mp3parse->last_ts = 0; diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index fda2e6e8ee..83d586af32 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -389,7 +389,6 @@ gst_rmdemux_validate_offset (GstRMDemux * rmdemux) rmdemux->offset); return FALSE; } - // TODO: Can we also be seeking to a 'DATA' chunk header? Check this. // Also, for the case we currently handle, can we check any more? It's pretty // sucky to not be validating a little more heavily than this... @@ -584,7 +583,7 @@ gst_rmdemux_perform_seek (GstRMDemux * rmdemux, gboolean flush) gst_rmdemux_send_event (rmdemux, gst_event_new_flush_stop ()); /* create the discont event we are going to send out */ - event = gst_event_new_newsegment (1.0, + event = gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, (gint64) rmdemux->segment_start, (gint64) rmdemux->segment_stop, 0); @@ -1032,7 +1031,7 @@ gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer) GST_LOG_OBJECT (rmdemux, "no more pads."); gst_rmdemux_send_event (rmdemux, - gst_event_new_newsegment (1.0, GST_FORMAT_TIME, (gint64) 0, + gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, (gint64) 0, (gint64) - 1, 0)); } @@ -1344,7 +1343,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream) gst_element_add_pad (GST_ELEMENT (rmdemux), stream->pad); gst_pad_push_event (stream->pad, - gst_event_new_newsegment (1.0, GST_FORMAT_TIME, (gint64) 0, + gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, (gint64) 0, (gint64) - 1, 0)); /* If there's some extra data then send it as the first packet */