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

omxaudioenc: Release baseaudioencoder stream lock while waiting for a buffer in ::handle_frame()

Browse source 
This prevents deadlocks if no empty input buffers are available and
releasing input buffers requires the loop function to handle some
output buffers first.
This commit is contained in:
Sebastian Dröge 2011-08-17 11:34:31 +02:00
parent 60a1e0e967
commit 92545e554c
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
omx/gstomxaudioenc.c
View file

@ -470,7 +470,7 @@ gst_omx_audio_enc_loop (GstOMXAudioEnc * self)
flow_ret = flow_ret =
gst_base_audio_encoder_finish_frame (GST_BASE_AUDIO_ENCODER (self), gst_base_audio_encoder_finish_frame (GST_BASE_AUDIO_ENCODER (self),
outbuf, -1); outbuf, 1024);
} }
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))
@ -767,7 +767,12 @@ gst_omx_audio_enc_handle_frame (GstBaseAudioEncoder * encoder,
duration = GST_BUFFER_DURATION (inbuf); duration = GST_BUFFER_DURATION (inbuf);
while (offset < GST_BUFFER_SIZE (inbuf)) { while (offset < GST_BUFFER_SIZE (inbuf)) {
/* Make sure to release the base class stream lock, otherwise
* _loop() can't call _finish_frame() and we might block forever
* because no input buffers are released */
GST_BASE_AUDIO_ENCODER_STREAM_UNLOCK (self);
acq_ret = gst_omx_port_acquire_buffer (self->in_port, &buf); acq_ret = gst_omx_port_acquire_buffer (self->in_port, &buf);
GST_BASE_AUDIO_ENCODER_STREAM_LOCK (self);
if (acq_ret == GST_OMX_ACQUIRE_BUFFER_ERROR) { if (acq_ret == GST_OMX_ACQUIRE_BUFFER_ERROR) {
goto component_error; goto component_error;