mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: Take stream lock one time only on drain

Browse source 
When the drain is triggered from the chain function the lock is already
taken so there is no need to take it one more time.

https://bugzilla.gnome.org/show_bug.cgi?id=767641
This commit is contained in:
Philippe Normand 2016-06-30 16:36:27 +02:00 committed by Sebastian Dröge
parent e18a9d9b5f
commit 6338146c06
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/video/gstvideodecoder.c
View file

@ -920,6 +920,7 @@ error_inactive:
} }
} }
/* This function has to be called with the stream lock taken. */
static GstFlowReturn static GstFlowReturn
gst_video_decoder_drain_out (GstVideoDecoder * dec, gboolean at_eos) gst_video_decoder_drain_out (GstVideoDecoder * dec, gboolean at_eos)
{ {
@ -927,8 +928,6 @@ gst_video_decoder_drain_out (GstVideoDecoder * dec, gboolean at_eos)
GstVideoDecoderPrivate *priv = dec->priv; GstVideoDecoderPrivate *priv = dec->priv;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GST_VIDEO_DECODER_STREAM_LOCK (dec);
if (dec->input_segment.rate > 0.0) { if (dec->input_segment.rate > 0.0) {
/* Forward mode, if unpacketized, give the child class /* Forward mode, if unpacketized, give the child class
* a final chance to flush out packets */ * a final chance to flush out packets */
@ -951,8 +950,6 @@ gst_video_decoder_drain_out (GstVideoDecoder * dec, gboolean at_eos)
ret = gst_video_decoder_flush_parse (dec, TRUE); ret = gst_video_decoder_flush_parse (dec, TRUE);
} }
GST_VIDEO_DECODER_STREAM_UNLOCK (dec);
return ret; return ret;
} }
@ -1104,11 +1101,11 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
{ {
GstFlowReturn flow_ret = GST_FLOW_OK; GstFlowReturn flow_ret = GST_FLOW_OK;
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
flow_ret = gst_video_decoder_drain_out (decoder, FALSE); flow_ret = gst_video_decoder_drain_out (decoder, FALSE);
ret = (flow_ret == GST_FLOW_OK); ret = (flow_ret == GST_FLOW_OK);
GST_DEBUG_OBJECT (decoder, "received STREAM_START. Clearing taglist"); GST_DEBUG_OBJECT (decoder, "received STREAM_START. Clearing taglist");
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
/* Flush upstream tags after a STREAM_START */ /* Flush upstream tags after a STREAM_START */
if (priv->upstream_tags) { if (priv->upstream_tags) {
gst_tag_list_unref (priv->upstream_tags); gst_tag_list_unref (priv->upstream_tags);
@ -1138,7 +1135,9 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
{ {
GstFlowReturn flow_ret = GST_FLOW_OK; GstFlowReturn flow_ret = GST_FLOW_OK;
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
flow_ret = gst_video_decoder_drain_out (decoder, TRUE); flow_ret = gst_video_decoder_drain_out (decoder, TRUE);
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
ret = (flow_ret == GST_FLOW_OK); ret = (flow_ret == GST_FLOW_OK);
/* Forward SEGMENT_DONE immediately. This is required /* Forward SEGMENT_DONE immediately. This is required
@ -1157,7 +1156,9 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
{ {
GstFlowReturn flow_ret = GST_FLOW_OK; GstFlowReturn flow_ret = GST_FLOW_OK;
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
flow_ret = gst_video_decoder_drain_out (decoder, TRUE); flow_ret = gst_video_decoder_drain_out (decoder, TRUE);
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
ret = (flow_ret == GST_FLOW_OK); ret = (flow_ret == GST_FLOW_OK);
/* Error out even if EOS was ok when we had input, but no output */ /* Error out even if EOS was ok when we had input, but no output */
@ -1185,11 +1186,11 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
GList *events; GList *events;
GList *frame_events; GList *frame_events;
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
flow_ret = gst_video_decoder_drain_out (decoder, FALSE); flow_ret = gst_video_decoder_drain_out (decoder, FALSE);
ret = (flow_ret == GST_FLOW_OK); ret = (flow_ret == GST_FLOW_OK);
/* Ensure we have caps before forwarding the event */ /* Ensure we have caps before forwarding the event */
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
if (!decoder->priv->output_state) { if (!decoder->priv->output_state) {
if (!gst_video_decoder_negotiate_default_caps (decoder)) { if (!gst_video_decoder_negotiate_default_caps (decoder)) {
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder); GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
@ -1237,7 +1238,9 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
if (gst_video_event_parse_still_frame (event, &in_still)) { if (gst_video_event_parse_still_frame (event, &in_still)) {
if (in_still) { if (in_still) {
GST_DEBUG_OBJECT (decoder, "draining current data for still-frame"); GST_DEBUG_OBJECT (decoder, "draining current data for still-frame");
GST_VIDEO_DECODER_STREAM_LOCK (decoder);
flow_ret = gst_video_decoder_drain_out (decoder, FALSE); flow_ret = gst_video_decoder_drain_out (decoder, FALSE);
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
ret = (flow_ret == GST_FLOW_OK); ret = (flow_ret == GST_FLOW_OK);
} }
/* Forward STILL_FRAME immediately. Everything is drained after /* Forward STILL_FRAME immediately. Everything is drained after