mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

flacdec: Send EOS when seeking after the end of file instead of failing

Browse source 
Fixes bug #649780.
This commit is contained in:
Sebastian Dröge 2011-05-11 10:25:15 +02:00
parent 88203989cd
commit d4b9cbc1ae
2 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
ext/flac/gstflacdec.c
View file

@ -1079,6 +1079,33 @@ gst_flac_dec_loop (GstPad * sinkpad)
GST_LOG_OBJECT (flacdec, "entering loop"); GST_LOG_OBJECT (flacdec, "entering loop");
if (flacdec->eos) {
GST_DEBUG_OBJECT (flacdec, "Seeked after end of file");
if (flacdec->close_segment) {
GST_DEBUG_OBJECT (flacdec, "pushing close segment");
gst_pad_push_event (flacdec->srcpad, flacdec->close_segment);
flacdec->close_segment = NULL;
}
if (flacdec->start_segment) {
GST_DEBUG_OBJECT (flacdec, "pushing start segment");
gst_pad_push_event (flacdec->srcpad, flacdec->start_segment);
flacdec->start_segment = NULL;
}
if (flacdec->tags) {
gst_element_found_tags_for_pad (GST_ELEMENT (flacdec), flacdec->srcpad,
flacdec->tags);
flacdec->tags = NULL;
}
if ((flacdec->segment.flags & GST_SEEK_FLAG_SEGMENT) == 0) {
goto eos_and_pause;
} else {
goto segment_done_and_pause;
}
}
if (flacdec->init) { if (flacdec->init) {
GST_DEBUG_OBJECT (flacdec, "initializing new decoder"); GST_DEBUG_OBJECT (flacdec, "initializing new decoder");
is = FLAC__stream_decoder_init_stream (flacdec->decoder, is = FLAC__stream_decoder_init_stream (flacdec->decoder,
@ -1840,6 +1867,14 @@ gst_flac_dec_handle_seek_event (GstFlacDec * flacdec, GstEvent * event)
} }
} }
/* Check if we seeked after the end of file */
if (start_type != GST_SEEK_TYPE_NONE && flacdec->segment.duration > 0 &&
start >= flacdec->segment.duration) {
flacdec->eos = TRUE;
} else {
flacdec->eos = FALSE;
}
flush = ((seek_flags & GST_SEEK_FLAG_FLUSH) == GST_SEEK_FLAG_FLUSH); flush = ((seek_flags & GST_SEEK_FLAG_FLUSH) == GST_SEEK_FLAG_FLUSH);
if (flush) { if (flush) {
@ -1903,17 +1938,21 @@ gst_flac_dec_handle_seek_event (GstFlacDec * flacdec, GstEvent * event)
* callbacks that need to behave differently when seeking */ * callbacks that need to behave differently when seeking */
flacdec->seeking = TRUE; flacdec->seeking = TRUE;
if (!flacdec->eos) {
GST_LOG_OBJECT (flacdec, "calling seek_absolute"); GST_LOG_OBJECT (flacdec, "calling seek_absolute");
seek_ok = FLAC__stream_decoder_seek_absolute (flacdec->decoder, seek_ok = FLAC__stream_decoder_seek_absolute (flacdec->decoder,
flacdec->segment.last_stop); flacdec->segment.last_stop);
GST_LOG_OBJECT (flacdec, "done with seek_absolute, seek_ok=%d", seek_ok); GST_LOG_OBJECT (flacdec, "done with seek_absolute, seek_ok=%d", seek_ok);
} else {
GST_LOG_OBJECT (flacdec, "not seeking, seeked after end of file");
seek_ok = TRUE;
}
flacdec->seeking = FALSE; flacdec->seeking = FALSE;
GST_DEBUG_OBJECT (flacdec, "performed seek to sample %" G_GINT64_FORMAT, GST_DEBUG_OBJECT (flacdec, "performed seek to sample %" G_GINT64_FORMAT,
flacdec->segment.last_stop); flacdec->segment.last_stop);
if (!seek_ok) { if (!seek_ok) {
GST_WARNING_OBJECT (flacdec, "seek failed"); GST_WARNING_OBJECT (flacdec, "seek failed");
/* seek failed, restore the segment and start streaming again with /* seek failed, restore the segment and start streaming again with
@ -2086,6 +2125,7 @@ gst_flac_dec_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
flacdec->eos = FALSE;
flacdec->seeking = FALSE; flacdec->seeking = FALSE;
flacdec->channels = 0; flacdec->channels = 0;
flacdec->depth = 0; flacdec->depth = 0;

2
ext/flac/gstflacdec.h
View file

@ -61,6 +61,8 @@ struct _GstFlacDec {
* don't push any buffers in the write callback * don't push any buffers in the write callback
* until we are actually at the new position */ * until we are actually at the new position */
gboolean eos; /* set to TRUE if seeked after the end of file */
GstSegment segment; /* the currently configured segment, in GstSegment segment; /* the currently configured segment, in
* samples/audio frames (DEFAULT format) */ * samples/audio frames (DEFAULT format) */
gboolean running; gboolean running;