mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-04 22:48:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxaudioenc: Make the srcpad task and the sinkpad streaming thread handling threadsafe

Browse source
This commit is contained in:
Sebastian Dröge 2011-11-10 15:10:14 +01:00
parent b62ffe1ada
commit f0775fac6f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
omx/gstomxaudioenc.c
View file

@ -446,6 +446,7 @@ gst_omx_audio_enc_loop (GstOMXAudioEnc * self)
GST_DEBUG_OBJECT (self, "Handling buffer: 0x%08x %lu", buf->omx_buf->nFlags, GST_DEBUG_OBJECT (self, "Handling buffer: 0x%08x %lu", buf->omx_buf->nFlags,
buf->omx_buf->nTimeStamp); buf->omx_buf->nTimeStamp);
GST_BASE_AUDIO_ENCODER_STREAM_LOCK (self);
if ((buf->omx_buf->nFlags & OMX_BUFFERFLAG_CODECCONFIG) if ((buf->omx_buf->nFlags & OMX_BUFFERFLAG_CODECCONFIG)
&& buf->omx_buf->nFilledLen > 0) { && buf->omx_buf->nFilledLen > 0) {
GstCaps *caps; GstCaps *caps;
@ -462,6 +463,7 @@ gst_omx_audio_enc_loop (GstOMXAudioEnc * self)
gst_caps_unref (caps); gst_caps_unref (caps);
if (buf) if (buf)
gst_omx_port_release_buffer (self->out_port, buf); gst_omx_port_release_buffer (self->out_port, buf);
GST_BASE_AUDIO_ENCODER_STREAM_UNLOCK (self);
goto caps_failed; goto caps_failed;
} }
gst_caps_unref (caps); gst_caps_unref (caps);
@ -523,6 +525,8 @@ gst_omx_audio_enc_loop (GstOMXAudioEnc * self)
if (flow_ret != GST_FLOW_OK) if (flow_ret != GST_FLOW_OK)
goto flow_error; goto flow_error;
GST_BASE_AUDIO_ENCODER_STREAM_UNLOCK (self);
return; return;
component_error: component_error:
@ -564,6 +568,7 @@ flow_error:
gst_pad_pause_task (GST_BASE_AUDIO_ENCODER_SRC_PAD (self)); gst_pad_pause_task (GST_BASE_AUDIO_ENCODER_SRC_PAD (self));
} }
self->started = FALSE; self->started = FALSE;
GST_BASE_AUDIO_ENCODER_STREAM_UNLOCK (self);
return; return;
} }
reconfigure_error: reconfigure_error:
@ -812,8 +817,10 @@ gst_omx_audio_enc_flush (GstBaseAudioEncoder * encoder)
gst_omx_port_set_flushing (self->out_port, TRUE); gst_omx_port_set_flushing (self->out_port, TRUE);
/* Wait until the srcpad loop is finished */ /* Wait until the srcpad loop is finished */
GST_BASE_AUDIO_ENCODER_STREAM_UNLOCK (self);
GST_PAD_STREAM_LOCK (GST_BASE_AUDIO_ENCODER_SRC_PAD (self)); GST_PAD_STREAM_LOCK (GST_BASE_AUDIO_ENCODER_SRC_PAD (self));
GST_PAD_STREAM_UNLOCK (GST_BASE_AUDIO_ENCODER_SRC_PAD (self)); GST_PAD_STREAM_UNLOCK (GST_BASE_AUDIO_ENCODER_SRC_PAD (self));
GST_BASE_AUDIO_ENCODER_STREAM_LOCK (self);
gst_omx_port_set_flushing (self->in_port, FALSE); gst_omx_port_set_flushing (self->in_port, FALSE);
gst_omx_port_set_flushing (self->out_port, FALSE); gst_omx_port_set_flushing (self->out_port, FALSE);