omxvideoenc: Improve EOS handling

If downstream return UNEXPECTED we should still signal the
drain cond because nothing will trigger this again later.
This commit is contained in:
Sebastian Dröge 2011-11-10 14:56:11 +01:00
parent 1b7742ca98
commit 56bcfc0397

View file

@ -840,15 +840,20 @@ gst_omx_video_enc_loop (GstOMXVideoEnc * self)
} }
GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (self); GST_BASE_VIDEO_CODEC_STREAM_UNLOCK (self);
if (flow_ret == GST_FLOW_OK && (buf->omx_buf->nFlags & OMX_BUFFERFLAG_EOS)) { if ((flow_ret == GST_FLOW_OK && (buf->omx_buf->nFlags & OMX_BUFFERFLAG_EOS))
|| flow_ret == GST_FLOW_UNEXPECTED) {
g_mutex_lock (self->drain_lock); g_mutex_lock (self->drain_lock);
if (self->draining) { if (self->draining) {
GST_DEBUG_OBJECT (self, "Drained");
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (self->drain_cond);
} else { } else if (flow_ret == GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "Component signalled EOS");
flow_ret = GST_FLOW_UNEXPECTED; flow_ret = GST_FLOW_UNEXPECTED;
} }
g_mutex_unlock (self->drain_lock); g_mutex_unlock (self->drain_lock);
} else {
GST_DEBUG_OBJECT (self, "Finished frame: %s", gst_flow_get_name (flow_ret));
} }
gst_omx_port_release_buffer (port, buf); gst_omx_port_release_buffer (port, buf);