diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/applemedia/avfvideosrc.m | 2 | ||||
-rw-r--r-- | sys/applemedia/celvideosrc.c | 2 | ||||
-rw-r--r-- | sys/applemedia/miovideosrc.c | 2 | ||||
-rw-r--r-- | sys/applemedia/qtkitvideosrc.m | 2 | ||||
-rw-r--r-- | sys/avc/gstavcsrc.cpp | 2 | ||||
-rw-r--r-- | sys/d3dvideosink/d3dvideosink.c | 2 | ||||
-rw-r--r-- | sys/decklink/gstdecklinksink.cpp | 2 | ||||
-rw-r--r-- | sys/dshowdecwrapper/gstdshowaudiodec.cpp | 2 | ||||
-rw-r--r-- | sys/dshowdecwrapper/gstdshowvideodec.cpp | 2 | ||||
-rw-r--r-- | sys/dshowsrcwrapper/gstdshowvideosrc.cpp | 2 | ||||
-rw-r--r-- | sys/dshowvideosink/dshowvideosink.cpp | 4 | ||||
-rw-r--r-- | sys/linsys/gstlinsyssdisrc.c | 2 | ||||
-rw-r--r-- | sys/shm/gstshmsink.c | 8 | ||||
-rw-r--r-- | sys/shm/gstshmsrc.c | 4 | ||||
-rw-r--r-- | sys/winks/gstksvideodevice.c | 2 |
15 files changed, 20 insertions, 20 deletions
diff --git a/sys/applemedia/avfvideosrc.m b/sys/applemedia/avfvideosrc.m index 37ff576f5..e6fb49613 100644 --- a/sys/applemedia/avfvideosrc.m +++ b/sys/applemedia/avfvideosrc.m @@ -421,7 +421,7 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer [bufQueueLock lockWhenCondition:HAS_BUFFER_OR_STOP_REQUEST]; if (stopRequest) { [bufQueueLock unlock]; - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } sbuf = (CMSampleBufferRef) [bufQueue lastObject]; diff --git a/sys/applemedia/celvideosrc.c b/sys/applemedia/celvideosrc.c index 6ea15e88f..60f9c1974 100644 --- a/sys/applemedia/celvideosrc.c +++ b/sys/applemedia/celvideosrc.c @@ -470,7 +470,7 @@ gst_cel_video_src_create (GstPushSrc * pushsrc, GstBuffer ** buf) shutting_down: { cm->FigSampleBufferRelease (sbuf); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } } diff --git a/sys/applemedia/miovideosrc.c b/sys/applemedia/miovideosrc.c index 7b0e428c4..f505b2c80 100644 --- a/sys/applemedia/miovideosrc.c +++ b/sys/applemedia/miovideosrc.c @@ -441,7 +441,7 @@ shutting_down: *buf = NULL; } - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } unexpected_format: { diff --git a/sys/applemedia/qtkitvideosrc.m b/sys/applemedia/qtkitvideosrc.m index c228692dd..fb9dcc338 100644 --- a/sys/applemedia/qtkitvideosrc.m +++ b/sys/applemedia/qtkitvideosrc.m @@ -434,7 +434,7 @@ openFailed: [queueLock lockWhenCondition:HAS_FRAME_OR_STOP_REQUEST]; if (stopRequest) { [queueLock unlock]; - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } frame = (CVPixelBufferRef) [queue lastObject]; diff --git a/sys/avc/gstavcsrc.cpp b/sys/avc/gstavcsrc.cpp index c63c9853a..d9c07bdd5 100644 --- a/sys/avc/gstavcsrc.cpp +++ b/sys/avc/gstavcsrc.cpp @@ -391,7 +391,7 @@ gst_avc_src_create (GstBaseSrc * src, guint64 offset, guint size, if (avcsrc->unlock) { if (buffer) gst_buffer_unref (buffer); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } gst_buffer_set_caps (buffer, GST_PAD_CAPS (avcsrc->srcpad)); diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c index 9ca6b960e..6c757b4b9 100644 --- a/sys/d3dvideosink/d3dvideosink.c +++ b/sys/d3dvideosink/d3dvideosink.c @@ -1710,7 +1710,7 @@ success: GST_D3DVIDEOSINK_SHARED_D3D_DEV_UNLOCK return GST_FLOW_OK; wrong_state: GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK (sink); - GST_D3DVIDEOSINK_SHARED_D3D_DEV_UNLOCK return GST_FLOW_WRONG_STATE; + GST_D3DVIDEOSINK_SHARED_D3D_DEV_UNLOCK return GST_FLOW_FLUSHING; /*unexpected:*/ /* GST_D3DVIDEOSINK_SWAP_CHAIN_UNLOCK(sink); */ /* GST_D3DVIDEOSINK_SHARED_D3D_DEV_UNLOCK */ diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp index 922419774..8ccb88054 100644 --- a/sys/decklink/gstdecklinksink.cpp +++ b/sys/decklink/gstdecklinksink.cpp @@ -741,7 +741,7 @@ gst_decklink_sink_videosink_chain (GstPad * pad, GstBuffer * buffer) ret = GST_FLOW_OK; } else { - ret = GST_FLOW_WRONG_STATE; + ret = GST_FLOW_FLUSHING; } frame->Release (); diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp index f10ac8cdc..884b8050d 100644 --- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp +++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp @@ -579,7 +579,7 @@ gst_dshowaudiodec_chain (GstPad * pad, GstBuffer * buffer) if (!adec->setup) { /* we are not set up */ GST_WARNING_OBJECT (adec, "Decoder not set up, failing"); - adec->last_ret = GST_FLOW_WRONG_STATE; + adec->last_ret = GST_FLOW_FLUSHING; goto beach; } diff --git a/sys/dshowdecwrapper/gstdshowvideodec.cpp b/sys/dshowdecwrapper/gstdshowvideodec.cpp index 663e98043..370f5192b 100644 --- a/sys/dshowdecwrapper/gstdshowvideodec.cpp +++ b/sys/dshowdecwrapper/gstdshowvideodec.cpp @@ -853,7 +853,7 @@ gst_dshowvideodec_chain (GstPad * pad, GstBuffer * buffer) if (!vdec->setup) { /* we are not setup */ GST_WARNING_OBJECT (vdec, "Decoder not set up, failing"); - vdec->last_ret = GST_FLOW_WRONG_STATE; + vdec->last_ret = GST_FLOW_FLUSHING; goto beach; } diff --git a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp index e84148ab4..35d01ba0f 100644 --- a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp +++ b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp @@ -868,7 +868,7 @@ gst_dshowvideosrc_create (GstPushSrc * psrc, GstBuffer ** buf) gst_buffer_unref (*buf); *buf = NULL; } - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } GST_DEBUG ("dshowvideosrc_create => pts %" GST_TIME_FORMAT " duration %" diff --git a/sys/dshowvideosink/dshowvideosink.cpp b/sys/dshowvideosink/dshowvideosink.cpp index 8b8554ca6..b1af014fd 100644 --- a/sys/dshowvideosink/dshowvideosink.cpp +++ b/sys/dshowvideosink/dshowvideosink.cpp @@ -1675,13 +1675,13 @@ gst_dshowvideosink_show_frame (GstVideoSink *vsink, GstBuffer *buffer) if (!sink->graph_running){ retst = gst_dshowvideosink_start_graph(sink); if (retst == GST_STATE_CHANGE_FAILURE) - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } ret = sink->fakesrc->GetOutputPin()->PushBuffer (buffer); if (!sink->graph_running){ retst = gst_dshowvideosink_pause_graph(sink); if (retst == GST_STATE_CHANGE_FAILURE) - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } GST_DSHOWVIDEOSINK_GRAPH_UNLOCK(sink); GST_DEBUG_OBJECT (sink, "Done pushing buffer through fakesrc->renderer: %s", gst_flow_get_name(ret)); diff --git a/sys/linsys/gstlinsyssdisrc.c b/sys/linsys/gstlinsyssdisrc.c index f3cd72a40..11384c8b3 100644 --- a/sys/linsys/gstlinsyssdisrc.c +++ b/sys/linsys/gstlinsyssdisrc.c @@ -415,7 +415,7 @@ gst_linsys_sdi_src_create (GstBaseSrc * src, guint64 _offset, guint size, guint8 *data = linsyssdisrc->tmpdata; if (linsyssdisrc->fd < 0) - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; if (linsyssdisrc->is_625) { sdi_width = 864; diff --git a/sys/shm/gstshmsink.c b/sys/shm/gstshmsink.c index cb6c92bfa..64490cf92 100644 --- a/sys/shm/gstshmsink.c +++ b/sys/shm/gstshmsink.c @@ -404,7 +404,7 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf) g_cond_wait (self->cond, GST_OBJECT_GET_LOCK (self)); if (self->unlock) { GST_OBJECT_UNLOCK (self); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } } @@ -412,7 +412,7 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf) g_cond_wait (self->cond, GST_OBJECT_GET_LOCK (self)); if (self->unlock) { GST_OBJECT_UNLOCK (self); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } } @@ -427,7 +427,7 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf) g_cond_wait (self->cond, GST_OBJECT_GET_LOCK (self)); if (self->unlock) { GST_OBJECT_UNLOCK (self); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } } while (self->wait_for_connection && !self->clients) { @@ -435,7 +435,7 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf) if (self->unlock) { sp_writer_free_block (block); GST_OBJECT_UNLOCK (self); - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } } diff --git a/sys/shm/gstshmsrc.c b/sys/shm/gstshmsrc.c index bbeadcd7d..7e6b20178 100644 --- a/sys/shm/gstshmsrc.c +++ b/sys/shm/gstshmsrc.c @@ -306,14 +306,14 @@ gst_shm_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) do { if (gst_poll_wait (self->poll, GST_CLOCK_TIME_NONE) < 0) { if (errno == EBUSY) - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Failed to read from shmsrc"), ("Poll failed on fd: %s", strerror (errno))); return GST_FLOW_ERROR; } if (self->unlocked) - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; if (gst_poll_fd_has_closed (self->poll, &self->pollfd)) { GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Failed to read from shmsrc"), diff --git a/sys/winks/gstksvideodevice.c b/sys/winks/gstksvideodevice.c index dbd7f035b..957b874e9 100644 --- a/sys/winks/gstksvideodevice.c +++ b/sys/winks/gstksvideodevice.c @@ -1146,7 +1146,7 @@ error_cancel: if (error_str != NULL) *error_str = NULL; - return GST_FLOW_WRONG_STATE; + return GST_FLOW_FLUSHING; } error_get_result: { |