mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideodec: Signal the drain GCond even if downstream returned an error

Browse source
This commit is contained in:
Sebastian Dröge 2011-11-17 11:25:52 -08:00
parent cc50d894af
commit 1371dafae4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
omx/gstomxvideodec.c
View file

@ -639,6 +639,7 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
GstFlowReturn flow_ret = GST_FLOW_OK; GstFlowReturn flow_ret = GST_FLOW_OK;
GstOMXAcquireBufferReturn acq_return; GstOMXAcquireBufferReturn acq_return;
GstClockTimeDiff deadline; GstClockTimeDiff deadline;
gboolean is_eos;
acq_return = gst_omx_port_acquire_buffer (port, &buf); acq_return = gst_omx_port_acquire_buffer (port, &buf);
if (acq_return == GST_OMX_ACQUIRE_BUFFER_ERROR) { if (acq_return == GST_OMX_ACQUIRE_BUFFER_ERROR) {
@ -718,6 +719,8 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
GST_BASE_VIDEO_CODEC_STREAM_LOCK (self); GST_BASE_VIDEO_CODEC_STREAM_LOCK (self);
frame = _find_nearest_frame (self, buf); frame = _find_nearest_frame (self, buf);
is_eos = ! !(buf->omx_buf->nFlags & OMX_BUFFERFLAG_EOS);
if (frame if (frame
&& (deadline = gst_base_video_decoder_get_max_decode_time && (deadline = gst_base_video_decoder_get_max_decode_time
(GST_BASE_VIDEO_DECODER (self), frame)) < 0) { (GST_BASE_VIDEO_DECODER (self), frame)) < 0) {
@ -780,8 +783,7 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
frame); frame);
} }
if ((flow_ret == GST_FLOW_OK && (buf->omx_buf->nFlags & OMX_BUFFERFLAG_EOS)) if (is_eos || flow_ret == GST_FLOW_UNEXPECTED) {
|| 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"); GST_DEBUG_OBJECT (self, "Drained");