diff options
-rw-r--r-- | omx/gstomxaudiodec.c | 12 | ||||
-rw-r--r-- | omx/gstomxaudioenc.c | 12 | ||||
-rw-r--r-- | omx/gstomxvideodec.c | 12 | ||||
-rw-r--r-- | omx/gstomxvideoenc.c | 12 |
4 files changed, 48 insertions, 0 deletions
diff --git a/omx/gstomxaudiodec.c b/omx/gstomxaudiodec.c index 9b84555..b6fdf34 100644 --- a/omx/gstomxaudiodec.c +++ b/omx/gstomxaudiodec.c @@ -599,9 +599,15 @@ component_error: flushing: { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self)); self->downstream_flow_ret = GST_FLOW_FLUSHING; self->started = FALSE; + g_mutex_unlock (&self->drain_lock); return; } @@ -673,8 +679,14 @@ flow_error: self->started = FALSE; } else if (flow_ret == GST_FLOW_FLUSHING) { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_AUDIO_DECODER_SRC_PAD (self)); self->started = FALSE; + g_mutex_unlock (&self->drain_lock); } GST_AUDIO_DECODER_STREAM_UNLOCK (self); return; diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c index 8724f5e..a6ba861 100644 --- a/omx/gstomxaudioenc.c +++ b/omx/gstomxaudioenc.c @@ -491,9 +491,15 @@ component_error: flushing: { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_AUDIO_ENCODER_SRC_PAD (self)); self->downstream_flow_ret = GST_FLOW_FLUSHING; self->started = FALSE; + g_mutex_unlock (&self->drain_lock); return; } eos: @@ -541,8 +547,14 @@ flow_error: self->started = FALSE; } else if (flow_ret == GST_FLOW_FLUSHING) { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_AUDIO_ENCODER_SRC_PAD (self)); self->started = FALSE; + g_mutex_unlock (&self->drain_lock); } GST_AUDIO_ENCODER_STREAM_UNLOCK (self); return; diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c index d52a576..2368f34 100644 --- a/omx/gstomxvideodec.c +++ b/omx/gstomxvideodec.c @@ -1534,9 +1534,15 @@ component_error: flushing: { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (self)); self->downstream_flow_ret = GST_FLOW_FLUSHING; self->started = FALSE; + g_mutex_unlock (&self->drain_lock); return; } @@ -1594,8 +1600,14 @@ flow_error: self->started = FALSE; } else if (flow_ret == GST_FLOW_FLUSHING) { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_VIDEO_DECODER_SRC_PAD (self)); self->started = FALSE; + g_mutex_unlock (&self->drain_lock); } GST_VIDEO_DECODER_STREAM_UNLOCK (self); return; diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index 0901b33..8e6cde3 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -788,9 +788,15 @@ component_error: flushing: { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_VIDEO_ENCODER_SRC_PAD (self)); self->downstream_flow_ret = GST_FLOW_FLUSHING; self->started = FALSE; + g_mutex_unlock (&self->drain_lock); return; } @@ -839,8 +845,14 @@ flow_error: self->started = FALSE; } else if (flow_ret == GST_FLOW_FLUSHING) { GST_DEBUG_OBJECT (self, "Flushing -- stopping task"); + g_mutex_lock (&self->drain_lock); + if (self->draining) { + self->draining = FALSE; + g_cond_broadcast (&self->drain_cond); + } gst_pad_pause_task (GST_VIDEO_ENCODER_SRC_PAD (self)); self->started = FALSE; + g_mutex_unlock (&self->drain_lock); } GST_VIDEO_ENCODER_STREAM_UNLOCK (self); return; |