mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-09 17:44:14 +00:00
omxvideodec: don't hold the stream lock when trying to push a frame
The base class methods will lock this properly when needed, there seems to be no need to lock it explicitly. This allows the patch in gstvideodec for unlocking the stream lock when pushing buffers out to work. https://bugzilla.gnome.org/show_bug.cgi?id=715192
This commit is contained in:
parent
f108eeafde
commit
04e1f76b60
1 changed files with 2 additions and 4 deletions
|
@ -1718,7 +1718,6 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
|
|||
gst_omx_buffer_flags_to_string (buf->omx_buf->nFlags),
|
||||
(guint64) GST_OMX_GET_TICKS (buf->omx_buf->nTimeStamp));
|
||||
|
||||
GST_VIDEO_DECODER_STREAM_LOCK (self);
|
||||
frame = gst_omx_video_find_nearest_frame (buf,
|
||||
gst_video_decoder_get_frames (GST_VIDEO_DECODER (self)));
|
||||
|
||||
|
@ -1862,13 +1861,13 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
|
|||
goto release_error;
|
||||
}
|
||||
|
||||
GST_VIDEO_DECODER_STREAM_LOCK (self);
|
||||
self->downstream_flow_ret = flow_ret;
|
||||
GST_VIDEO_DECODER_STREAM_UNLOCK (self);
|
||||
|
||||
if (flow_ret != GST_FLOW_OK)
|
||||
goto flow_error;
|
||||
|
||||
GST_VIDEO_DECODER_STREAM_UNLOCK (self);
|
||||
|
||||
return;
|
||||
|
||||
component_error:
|
||||
|
@ -1941,7 +1940,6 @@ flow_error:
|
|||
GST_DEBUG_OBJECT (self, "Flushing -- stopping task");
|
||||
}
|
||||
gst_omx_video_dec_pause_loop (self, flow_ret);
|
||||
GST_VIDEO_DECODER_STREAM_UNLOCK (self);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue