mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-31 03:29:50 +00:00
Code Issues 1 Projects Releases Wiki Activity

GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING

Browse source
This commit is contained in:
Wim Taymans 2012-02-08 16:41:19 +01:00
parent ab88f15674
commit b5609f651e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/ffmpeg/gstffmpegdemux.c
View file

@ -1509,7 +1509,7 @@ read_failed:
GST_OBJECT_LOCK (demux); GST_OBJECT_LOCK (demux);
/* pause appropriatly based on if we are flushing or not */ /* pause appropriatly based on if we are flushing or not */
if (demux->flushing) if (demux->flushing)
ret = GST_FLOW_WRONG_STATE; ret = GST_FLOW_FLUSHING;
else if (gst_ffmpegdemux_has_outputted (demux) else if (gst_ffmpegdemux_has_outputted (demux)
|| gst_ffmpegdemux_is_eos (demux)) { || gst_ffmpegdemux_is_eos (demux)) {
GST_DEBUG_OBJECT (demux, "We are EOS"); GST_DEBUG_OBJECT (demux, "We are EOS");
@ -1562,7 +1562,7 @@ gst_ffmpegdemux_sink_event (GstPad * sinkpad, GstObject * parent,
/* now unblock the chain function */ /* now unblock the chain function */
GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe); GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe);
ffpipe->srcresult = GST_FLOW_WRONG_STATE; ffpipe->srcresult = GST_FLOW_FLUSHING;
GST_FFMPEG_PIPE_SIGNAL (ffpipe); GST_FFMPEG_PIPE_SIGNAL (ffpipe);
GST_FFMPEG_PIPE_MUTEX_UNLOCK (ffpipe); GST_FFMPEG_PIPE_MUTEX_UNLOCK (ffpipe);
@ -1680,7 +1680,7 @@ ignore:
if (buffer) if (buffer)
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return GST_FLOW_WRONG_STATE; return GST_FLOW_FLUSHING;
} }
} }
@ -1742,7 +1742,7 @@ gst_ffmpegdemux_sink_activate_push (GstPad * sinkpad, GstObject * parent,
/* release chain and loop */ /* release chain and loop */
GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe); GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe);
demux->ffpipe.srcresult = GST_FLOW_WRONG_STATE; demux->ffpipe.srcresult = GST_FLOW_FLUSHING;
/* end streaming by making ffmpeg believe eos */ /* end streaming by making ffmpeg believe eos */
demux->ffpipe.eos = TRUE; demux->ffpipe.eos = TRUE;
GST_FFMPEG_PIPE_SIGNAL (ffpipe); GST_FFMPEG_PIPE_SIGNAL (ffpipe);

2
ext/ffmpeg/gstffmpegprotocol.c
View file

@ -118,7 +118,7 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
case GST_FLOW_EOS: case GST_FLOW_EOS:
total = 0; total = 0;
break; break;
case GST_FLOW_WRONG_STATE: case GST_FLOW_FLUSHING:
total = -1; total = -1;
break; break;
default: default: