mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Update to new GLib thread API

Browse source
This commit is contained in:
Sebastian Dröge 2012-11-12 11:29:48 +01:00
parent bced70525a
commit 2481ceb8c4
10 changed files with 124 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
omx/gstomx.c
View file

@ -54,7 +54,7 @@ gst_omx_core_acquire (const gchar * filename)
core = g_hash_table_lookup (core_handles, filename); core = g_hash_table_lookup (core_handles, filename);
if (!core) { if (!core) {
core = g_slice_new0 (GstOMXCore); core = g_slice_new0 (GstOMXCore);
core->lock = g_mutex_new (); g_mutex_init (&core->lock);
core->user_count = 0; core->user_count = 0;
g_hash_table_insert (core_handles, g_strdup (filename), core); g_hash_table_insert (core_handles, g_strdup (filename), core);
@ -77,7 +77,7 @@ gst_omx_core_acquire (const gchar * filename)
GST_DEBUG ("Successfully loaded core '%s'", filename); GST_DEBUG ("Successfully loaded core '%s'", filename);
} }
g_mutex_lock (core->lock); g_mutex_lock (&core->lock);
core->user_count++; core->user_count++;
if (core->user_count == 1) { if (core->user_count == 1) {
OMX_ERRORTYPE err; OMX_ERRORTYPE err;
@ -85,14 +85,14 @@ gst_omx_core_acquire (const gchar * filename)
err = core->init (); err = core->init ();
if (err != OMX_ErrorNone) { if (err != OMX_ErrorNone) {
GST_ERROR ("Failed to initialize core '%s': 0x%08x", filename, err); GST_ERROR ("Failed to initialize core '%s': 0x%08x", filename, err);
g_mutex_unlock (core->lock); g_mutex_unlock (&core->lock);
goto error; goto error;
} }
GST_DEBUG ("Successfully initialized core '%s'", filename); GST_DEBUG ("Successfully initialized core '%s'", filename);
} }
g_mutex_unlock (core->lock); g_mutex_unlock (&core->lock);
G_UNLOCK (core_handles); G_UNLOCK (core_handles);
return core; return core;
@ -113,7 +113,7 @@ symbol_error:
error: error:
{ {
g_hash_table_remove (core_handles, filename); g_hash_table_remove (core_handles, filename);
g_mutex_free (core->lock); g_mutex_clear (&core->lock);
g_slice_free (GstOMXCore, core); g_slice_free (GstOMXCore, core);
G_UNLOCK (core_handles); G_UNLOCK (core_handles);
@ -129,7 +129,7 @@ gst_omx_core_release (GstOMXCore * core)
G_LOCK (core_handles); G_LOCK (core_handles);
g_mutex_lock (core->lock); g_mutex_lock (&core->lock);
GST_DEBUG ("Releasing core %p", core); GST_DEBUG ("Releasing core %p", core);
@ -139,7 +139,7 @@ gst_omx_core_release (GstOMXCore * core)
core->deinit (); core->deinit ();
} }
g_mutex_unlock (core->lock); g_mutex_unlock (&core->lock);
G_UNLOCK (core_handles); G_UNLOCK (core_handles);
} }
@ -167,7 +167,7 @@ EventHandler (OMX_HANDLETYPE hComponent, OMX_PTR pAppData, OMX_EVENTTYPE eEvent,
comp->state = (OMX_STATETYPE) nData2; comp->state = (OMX_STATETYPE) nData2;
if (comp->state == comp->pending_state) if (comp->state == comp->pending_state)
comp->pending_state = OMX_StateInvalid; comp->pending_state = OMX_StateInvalid;
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
gst_omx_rec_mutex_recursive_unlock (&comp->state_lock); gst_omx_rec_mutex_recursive_unlock (&comp->state_lock);
break; break;
} }
@ -192,7 +192,7 @@ EventHandler (OMX_HANDLETYPE hComponent, OMX_PTR pAppData, OMX_EVENTTYPE eEvent,
*/ */
if (port->flushing) { if (port->flushing) {
port->flushed = TRUE; port->flushed = TRUE;
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
} else { } else {
GST_ERROR_OBJECT (comp->parent, "Port %u was not flushing", GST_ERROR_OBJECT (comp->parent, "Port %u was not flushing",
port->index); port->index);
@ -214,7 +214,7 @@ EventHandler (OMX_HANDLETYPE hComponent, OMX_PTR pAppData, OMX_EVENTTYPE eEvent,
gst_omx_rec_mutex_recursive_lock (&port->port_lock); gst_omx_rec_mutex_recursive_lock (&port->port_lock);
port->enabled_changed = TRUE; port->enabled_changed = TRUE;
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
gst_omx_rec_mutex_recursive_unlock (&port->port_lock); gst_omx_rec_mutex_recursive_unlock (&port->port_lock);
break; break;
@ -270,7 +270,7 @@ EventHandler (OMX_HANDLETYPE hComponent, OMX_PTR pAppData, OMX_EVENTTYPE eEvent,
port->settings_cookie++; port->settings_cookie++;
if (port->port_def.eDir == OMX_DirOutput) if (port->port_def.eDir == OMX_DirOutput)
outports = g_list_prepend (outports, port); outports = g_list_prepend (outports, port);
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
} }
gst_omx_rec_mutex_recursive_unlock (&port->port_lock); gst_omx_rec_mutex_recursive_unlock (&port->port_lock);
} }
@ -352,7 +352,7 @@ EmptyBufferDone (OMX_HANDLETYPE hComponent, OMX_PTR pAppData,
buf->omx_buf->nFlags = 0; buf->omx_buf->nFlags = 0;
g_queue_push_tail (port->pending_buffers, buf); g_queue_push_tail (port->pending_buffers, buf);
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
gst_omx_rec_mutex_recursive_unlock (&port->port_lock); gst_omx_rec_mutex_recursive_unlock (&port->port_lock);
return OMX_ErrorNone; return OMX_ErrorNone;
@ -383,7 +383,7 @@ FillBufferDone (OMX_HANDLETYPE hComponent, OMX_PTR pAppData,
buf, buf->omx_buf->pBuffer); buf, buf->omx_buf->pBuffer);
buf->used = FALSE; buf->used = FALSE;
g_queue_push_tail (port->pending_buffers, buf); g_queue_push_tail (port->pending_buffers, buf);
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
gst_omx_rec_mutex_recursive_unlock (&port->port_lock); gst_omx_rec_mutex_recursive_unlock (&port->port_lock);
return OMX_ErrorNone; return OMX_ErrorNone;
@ -428,7 +428,7 @@ gst_omx_component_new (GstObject * parent, const GstOMXClassData * cdata)
comp->n_out_ports = 0; comp->n_out_ports = 0;
gst_omx_rec_mutex_init (&comp->state_lock); gst_omx_rec_mutex_init (&comp->state_lock);
comp->state_cond = g_cond_new (); g_cond_init (&comp->state_cond);
comp->pending_state = OMX_StateInvalid; comp->pending_state = OMX_StateInvalid;
comp->last_error = OMX_ErrorNone; comp->last_error = OMX_ErrorNone;
@ -476,7 +476,7 @@ gst_omx_component_free (GstOMXComponent * comp)
gst_omx_port_deallocate_buffers (port); gst_omx_port_deallocate_buffers (port);
gst_omx_rec_mutex_clear (&port->port_lock); gst_omx_rec_mutex_clear (&port->port_lock);
g_cond_free (port->port_cond); g_cond_clear (&port->port_cond);
g_queue_free (port->pending_buffers); g_queue_free (port->pending_buffers);
g_slice_free (GstOMXPort, port); g_slice_free (GstOMXPort, port);
@ -492,7 +492,7 @@ gst_omx_component_free (GstOMXComponent * comp)
comp->core->free_handle (comp->handle); comp->core->free_handle (comp->handle);
gst_omx_core_release (comp->core); gst_omx_core_release (comp->core);
g_cond_free (comp->state_cond); g_cond_clear (&comp->state_cond);
gst_omx_rec_mutex_clear (&comp->state_lock); gst_omx_rec_mutex_clear (&comp->state_lock);
gst_object_unref (comp->parent); gst_object_unref (comp->parent);
@ -531,7 +531,7 @@ gst_omx_component_set_state (GstOMXComponent * comp, OMX_STATETYPE state)
g_list_free (comp->pending_reconfigure_outports); g_list_free (comp->pending_reconfigure_outports);
comp->pending_reconfigure_outports = NULL; comp->pending_reconfigure_outports = NULL;
/* Notify all inports that are still waiting */ /* Notify all inports that are still waiting */
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
} }
gst_omx_rec_mutex_begin_recursion (&comp->state_lock); gst_omx_rec_mutex_begin_recursion (&comp->state_lock);
@ -555,7 +555,7 @@ OMX_STATETYPE
gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout) gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout)
{ {
OMX_STATETYPE ret; OMX_STATETYPE ret;
GTimeVal *timeval, abstimeout; gint64 wait_until = -1;
gboolean signalled = TRUE; gboolean signalled = TRUE;
g_return_val_if_fail (comp != NULL, OMX_StateInvalid); g_return_val_if_fail (comp != NULL, OMX_StateInvalid);
@ -575,23 +575,26 @@ gst_omx_component_get_state (GstOMXComponent * comp, GstClockTime timeout)
} }
if (timeout != GST_CLOCK_TIME_NONE) { if (timeout != GST_CLOCK_TIME_NONE) {
glong add = timeout / (GST_SECOND / G_USEC_PER_SEC); gint64 add = timeout / (GST_SECOND / G_TIME_SPAN_SECOND);
if (add == 0) if (add == 0)
goto done; goto done;
g_get_current_time (&abstimeout); wait_until = g_get_monotonic_time () + add;
g_time_val_add (&abstimeout, add);
timeval = &abstimeout;
GST_DEBUG_OBJECT (comp->parent, "Waiting for %ld us", add); GST_DEBUG_OBJECT (comp->parent, "Waiting for %ld us", add);
} else { } else {
timeval = NULL;
GST_DEBUG_OBJECT (comp->parent, "Waiting for signal"); GST_DEBUG_OBJECT (comp->parent, "Waiting for signal");
} }
do { do {
signalled = if (wait_until == -1) {
g_cond_timed_wait (comp->state_cond, comp->state_lock.lock, timeval); g_cond_wait (&comp->state_cond, &comp->state_lock.lock);
signalled = TRUE;
} else {
signalled =
g_cond_wait_until (&comp->state_cond, &comp->state_lock.lock,
wait_until);
}
} while (signalled && comp->last_error == OMX_ErrorNone } while (signalled && comp->last_error == OMX_ErrorNone
&& comp->pending_state != OMX_StateInvalid); && comp->pending_state != OMX_StateInvalid);
@ -662,7 +665,7 @@ gst_omx_component_add_port (GstOMXComponent * comp, guint32 index)
port->port_def = port_def; port->port_def = port_def;
gst_omx_rec_mutex_init (&port->port_lock); gst_omx_rec_mutex_init (&port->port_lock);
port->port_cond = g_cond_new (); g_cond_init (&port->port_cond);
port->pending_buffers = g_queue_new (); port->pending_buffers = g_queue_new ();
port->flushing = TRUE; port->flushing = TRUE;
port->flushed = FALSE; port->flushed = FALSE;
@ -740,7 +743,7 @@ gst_omx_component_set_last_error (GstOMXComponent * comp, OMX_ERRORTYPE err)
*/ */
if (comp->last_error == OMX_ErrorNone) if (comp->last_error == OMX_ErrorNone)
comp->last_error = err; comp->last_error = err;
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
gst_omx_rec_mutex_recursive_unlock (&comp->state_lock); gst_omx_rec_mutex_recursive_unlock (&comp->state_lock);
/* Now notify all ports, no locking needed /* Now notify all ports, no locking needed
@ -753,7 +756,7 @@ gst_omx_component_set_last_error (GstOMXComponent * comp, OMX_ERRORTYPE err)
GstOMXPort *tmp = g_ptr_array_index (comp->ports, i); GstOMXPort *tmp = g_ptr_array_index (comp->ports, i);
gst_omx_rec_mutex_recursive_lock (&tmp->port_lock); gst_omx_rec_mutex_recursive_lock (&tmp->port_lock);
g_cond_broadcast (tmp->port_cond); g_cond_broadcast (&tmp->port_cond);
gst_omx_rec_mutex_recursive_unlock (&tmp->port_lock); gst_omx_rec_mutex_recursive_unlock (&tmp->port_lock);
} }
} }
@ -945,7 +948,7 @@ retry:
(err = comp->last_error) == OMX_ErrorNone && !port->flushing) { (err = comp->last_error) == OMX_ErrorNone && !port->flushing) {
GST_DEBUG_OBJECT (comp->parent, GST_DEBUG_OBJECT (comp->parent,
"Waiting for output ports to reconfigure"); "Waiting for output ports to reconfigure");
g_cond_wait (comp->state_cond, comp->state_lock.lock); g_cond_wait (&comp->state_cond, &comp->state_lock.lock);
} }
gst_omx_rec_mutex_unlock (&comp->state_lock); gst_omx_rec_mutex_unlock (&comp->state_lock);
gst_omx_rec_mutex_lock (&port->port_lock); gst_omx_rec_mutex_lock (&port->port_lock);
@ -1003,7 +1006,7 @@ retry:
*/ */
if (g_queue_is_empty (port->pending_buffers)) { if (g_queue_is_empty (port->pending_buffers)) {
GST_DEBUG_OBJECT (comp->parent, "Queue of port %u is empty", port->index); GST_DEBUG_OBJECT (comp->parent, "Queue of port %u is empty", port->index);
g_cond_wait (port->port_cond, port->port_lock.lock); g_cond_wait (&port->port_cond, &port->port_lock.lock);
} else { } else {
GST_DEBUG_OBJECT (comp->parent, "Port %u has pending buffers", port->index); GST_DEBUG_OBJECT (comp->parent, "Port %u has pending buffers", port->index);
_buf = g_queue_pop_head (port->pending_buffers); _buf = g_queue_pop_head (port->pending_buffers);
@ -1057,7 +1060,7 @@ gst_omx_port_release_buffer (GstOMXPort * port, GstOMXBuffer * buf)
GST_ERROR_OBJECT (comp->parent, "Component is in error state: %s (0x%08x)", GST_ERROR_OBJECT (comp->parent, "Component is in error state: %s (0x%08x)",
gst_omx_error_to_string (err), err); gst_omx_error_to_string (err), err);
g_queue_push_tail (port->pending_buffers, buf); g_queue_push_tail (port->pending_buffers, buf);
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
goto done; goto done;
} }
@ -1065,7 +1068,7 @@ gst_omx_port_release_buffer (GstOMXPort * port, GstOMXBuffer * buf)
GST_DEBUG_OBJECT (comp->parent, "Port %u is flushing, not releasing buffer", GST_DEBUG_OBJECT (comp->parent, "Port %u is flushing, not releasing buffer",
port->index); port->index);
g_queue_push_tail (port->pending_buffers, buf); g_queue_push_tail (port->pending_buffers, buf);
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
goto done; goto done;
} }
@ -1131,11 +1134,11 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
port->flushing = flush; port->flushing = flush;
if (flush) { if (flush) {
GTimeVal abstimeout, *timeval; gint64 wait_until;
gboolean signalled; gboolean signalled;
OMX_ERRORTYPE last_error; OMX_ERRORTYPE last_error;
g_cond_broadcast (port->port_cond); g_cond_broadcast (&port->port_cond);
/* We also need to signal the state cond because /* We also need to signal the state cond because
* an input port might wait on this for the output * an input port might wait on this for the output
@ -1145,7 +1148,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
* for is true after waking up. * for is true after waking up.
*/ */
gst_omx_rec_mutex_lock (&comp->state_lock); gst_omx_rec_mutex_lock (&comp->state_lock);
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
gst_omx_rec_mutex_unlock (&comp->state_lock); gst_omx_rec_mutex_unlock (&comp->state_lock);
/* Now flush the port */ /* Now flush the port */
@ -1174,9 +1177,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
goto done; goto done;
} }
g_get_current_time (&abstimeout); wait_until = g_get_monotonic_time () + 5 * G_TIME_SPAN_SECOND;
g_time_val_add (&abstimeout, 5 * G_USEC_PER_SEC);
timeval = &abstimeout;
GST_DEBUG_OBJECT (comp->parent, "Waiting for 5s"); GST_DEBUG_OBJECT (comp->parent, "Waiting for 5s");
/* Retry until timeout or until an error happend or /* Retry until timeout or until an error happend or
@ -1187,7 +1188,8 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
while (signalled && last_error == OMX_ErrorNone && !port->flushed while (signalled && last_error == OMX_ErrorNone && !port->flushed
&& port->buffers->len > g_queue_get_length (port->pending_buffers)) { && port->buffers->len > g_queue_get_length (port->pending_buffers)) {
signalled = signalled =
g_cond_timed_wait (port->port_cond, port->port_lock.lock, timeval); g_cond_wait_until (&comp->state_cond, &comp->state_lock.lock,
wait_until);
last_error = gst_omx_component_get_last_error (comp); last_error = gst_omx_component_get_last_error (comp);
} }
@ -1496,7 +1498,7 @@ gst_omx_port_set_enabled_unlocked (GstOMXPort * port, gboolean enabled)
{ {
GstOMXComponent *comp; GstOMXComponent *comp;
OMX_ERRORTYPE err = OMX_ErrorNone; OMX_ERRORTYPE err = OMX_ErrorNone;
GTimeVal abstimeout, *timeval; gint64 wait_until;
gboolean signalled; gboolean signalled;
OMX_ERRORTYPE last_error; OMX_ERRORTYPE last_error;
@ -1555,9 +1557,7 @@ gst_omx_port_set_enabled_unlocked (GstOMXPort * port, gboolean enabled)
goto done; goto done;
} }
g_get_current_time (&abstimeout); wait_until = g_get_monotonic_time () + 5 * G_TIME_SPAN_SECOND;
g_time_val_add (&abstimeout, 5 * G_USEC_PER_SEC);
timeval = &abstimeout;
GST_DEBUG_OBJECT (comp->parent, "Waiting for 5s"); GST_DEBUG_OBJECT (comp->parent, "Waiting for 5s");
/* First wait until all buffers are released by the port */ /* First wait until all buffers are released by the port */
@ -1566,7 +1566,7 @@ gst_omx_port_set_enabled_unlocked (GstOMXPort * port, gboolean enabled)
while (signalled && last_error == OMX_ErrorNone && (port->buffers while (signalled && last_error == OMX_ErrorNone && (port->buffers
&& port->buffers->len > g_queue_get_length (port->pending_buffers))) { && port->buffers->len > g_queue_get_length (port->pending_buffers))) {
signalled = signalled =
g_cond_timed_wait (port->port_cond, port->port_lock.lock, timeval); g_cond_wait_until (&port->port_cond, &port->port_lock.lock, wait_until);
last_error = gst_omx_component_get_last_error (comp); last_error = gst_omx_component_get_last_error (comp);
} }
@ -1606,7 +1606,7 @@ gst_omx_port_set_enabled_unlocked (GstOMXPort * port, gboolean enabled)
while (signalled && last_error == OMX_ErrorNone while (signalled && last_error == OMX_ErrorNone
&& (! !port->port_def.bEnabled != ! !enabled || !port->enabled_changed)) { && (! !port->port_def.bEnabled != ! !enabled || !port->enabled_changed)) {
signalled = signalled =
g_cond_timed_wait (port->port_cond, port->port_lock.lock, timeval); g_cond_wait_until (&port->port_cond, &port->port_lock.lock, wait_until);
last_error = gst_omx_component_get_last_error (comp); last_error = gst_omx_component_get_last_error (comp);
gst_omx_component_get_parameter (comp, OMX_IndexParamPortDefinition, gst_omx_component_get_parameter (comp, OMX_IndexParamPortDefinition,
&port->port_def); &port->port_def);
@ -1770,7 +1770,7 @@ gst_omx_port_reconfigure (GstOMXPort * port)
} }
if (!comp->pending_reconfigure_outports) { if (!comp->pending_reconfigure_outports) {
g_atomic_int_set (&comp->have_pending_reconfigure_outports, 0); g_atomic_int_set (&comp->have_pending_reconfigure_outports, 0);
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
} }
gst_omx_rec_mutex_unlock (&comp->state_lock); gst_omx_rec_mutex_unlock (&comp->state_lock);
} }
@ -1833,7 +1833,7 @@ gst_omx_port_manual_reconfigure (GstOMXPort * port, gboolean start)
} }
if (!comp->pending_reconfigure_outports) { if (!comp->pending_reconfigure_outports) {
g_atomic_int_set (&comp->have_pending_reconfigure_outports, 0); g_atomic_int_set (&comp->have_pending_reconfigure_outports, 0);
g_cond_broadcast (comp->state_cond); g_cond_broadcast (&comp->state_cond);
} }
gst_omx_rec_mutex_unlock (&comp->state_lock); gst_omx_rec_mutex_unlock (&comp->state_lock);
} }

6
omx/gstomx.h
View file

@ -106,7 +106,7 @@ struct _GstOMXCore {
/* Current number of users, transitions from/to 0 /* Current number of users, transitions from/to 0
* call init/deinit */ * call init/deinit */
GMutex *lock; GMutex lock;
gint user_count; /* LOCK */ gint user_count; /* LOCK */
/* OpenMAX core library functions, protected with LOCK */ /* OpenMAX core library functions, protected with LOCK */
@ -141,7 +141,7 @@ struct _GstOMXPort {
* the component's state lock if both are needed! * the component's state lock if both are needed!
*/ */
GstOMXRecMutex port_lock; GstOMXRecMutex port_lock;
GCond *port_cond; GCond port_cond;
OMX_PARAM_PORTDEFINITIONTYPE port_def; OMX_PARAM_PORTDEFINITIONTYPE port_def;
GPtrArray *buffers; /* Contains GstOMXBuffer* */ GPtrArray *buffers; /* Contains GstOMXBuffer* */
GQueue *pending_buffers; /* Contains GstOMXBuffer* */ GQueue *pending_buffers; /* Contains GstOMXBuffer* */
@ -174,7 +174,7 @@ struct _GstOMXComponent {
* Signalled if one of them changes * Signalled if one of them changes
*/ */
GstOMXRecMutex state_lock; GstOMXRecMutex state_lock;
GCond *state_cond; GCond state_cond;
OMX_STATETYPE state; OMX_STATETYPE state;
/* OMX_StateInvalid if no pending state */ /* OMX_StateInvalid if no pending state */
OMX_STATETYPE pending_state; OMX_STATETYPE pending_state;

34
omx/gstomxaudioenc.c
View file

@ -95,8 +95,8 @@ gst_omx_audio_enc_class_init (GstOMXAudioEncClass * klass)
static void static void
gst_omx_audio_enc_init (GstOMXAudioEnc * self) gst_omx_audio_enc_init (GstOMXAudioEnc * self)
{ {
self->drain_lock = g_mutex_new (); g_mutex_init (&self->drain_lock);
self->drain_cond = g_cond_new (); g_cond_init (&self->drain_cond);
} }
static gboolean static gboolean
@ -172,8 +172,8 @@ gst_omx_audio_enc_finalize (GObject * object)
{ {
GstOMXAudioEnc *self = GST_OMX_AUDIO_ENC (object); GstOMXAudioEnc *self = GST_OMX_AUDIO_ENC (object);
g_mutex_free (self->drain_lock); g_mutex_clear (&self->drain_lock);
g_cond_free (self->drain_cond); g_cond_clear (&self->drain_cond);
G_OBJECT_CLASS (gst_omx_audio_enc_parent_class)->finalize (object); G_OBJECT_CLASS (gst_omx_audio_enc_parent_class)->finalize (object);
} }
@ -211,10 +211,10 @@ gst_omx_audio_enc_change_state (GstElement * element, GstStateChange transition)
if (self->out_port) if (self->out_port)
gst_omx_port_set_flushing (self->out_port, TRUE); gst_omx_port_set_flushing (self->out_port, TRUE);
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
break; break;
default: default:
break; break;
@ -392,16 +392,16 @@ gst_omx_audio_enc_loop (GstOMXAudioEnc * self)
} }
if (is_eos || flow_ret == GST_FLOW_EOS) { if (is_eos || flow_ret == GST_FLOW_EOS) {
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");
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
} else if (flow_ret == GST_FLOW_OK) { } else if (flow_ret == GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "Component signalled EOS"); GST_DEBUG_OBJECT (self, "Component signalled EOS");
flow_ret = GST_FLOW_EOS; flow_ret = GST_FLOW_EOS;
} }
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
} else { } else {
GST_DEBUG_OBJECT (self, "Finished frame: %s", GST_DEBUG_OBJECT (self, "Finished frame: %s",
gst_flow_get_name (flow_ret)); gst_flow_get_name (flow_ret));
@ -523,10 +523,10 @@ gst_omx_audio_enc_stop (GstAudioEncoder * encoder)
self->started = FALSE; self->started = FALSE;
self->eos = FALSE; self->eos = FALSE;
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
gst_omx_component_get_state (self->component, 5 * GST_SECOND); gst_omx_component_get_state (self->component, 5 * GST_SECOND);
@ -887,7 +887,7 @@ gst_omx_audio_enc_sink_event (GstAudioEncoder * encoder, GstEvent * event)
/* Insert a NULL into the queue to signal EOS */ /* Insert a NULL into the queue to signal EOS */
gst_omx_rec_mutex_lock (&self->out_port->port_lock); gst_omx_rec_mutex_lock (&self->out_port->port_lock);
g_queue_push_tail (self->out_port->pending_buffers, NULL); g_queue_push_tail (self->out_port->pending_buffers, NULL);
g_cond_broadcast (self->out_port->port_cond); g_cond_broadcast (&self->out_port->port_cond);
gst_omx_rec_mutex_unlock (&self->out_port->port_lock); gst_omx_rec_mutex_unlock (&self->out_port->port_lock);
return TRUE; return TRUE;
} }
@ -966,7 +966,7 @@ gst_omx_audio_enc_drain (GstOMXAudioEnc * self)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = TRUE; self->draining = TRUE;
buf->omx_buf->nFilledLen = 0; buf->omx_buf->nFilledLen = 0;
buf->omx_buf->nTimeStamp = buf->omx_buf->nTimeStamp =
@ -976,9 +976,9 @@ gst_omx_audio_enc_drain (GstOMXAudioEnc * self)
buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS; buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS;
gst_omx_port_release_buffer (self->in_port, buf); gst_omx_port_release_buffer (self->in_port, buf);
GST_DEBUG_OBJECT (self, "Waiting until component is drained"); GST_DEBUG_OBJECT (self, "Waiting until component is drained");
g_cond_wait (self->drain_cond, self->drain_lock); g_cond_wait (&self->drain_cond, &self->drain_lock);
GST_DEBUG_OBJECT (self, "Drained component"); GST_DEBUG_OBJECT (self, "Drained component");
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
GST_AUDIO_ENCODER_STREAM_LOCK (self); GST_AUDIO_ENCODER_STREAM_LOCK (self);
self->started = FALSE; self->started = FALSE;

4
omx/gstomxaudioenc.h
View file

@ -64,8 +64,8 @@ struct _GstOMXAudioEnc
gboolean eos; gboolean eos;
/* Draining state */ /* Draining state */
GMutex *drain_lock; GMutex drain_lock;
GCond *drain_cond; GCond drain_cond;
/* TRUE if EOS buffers shouldn't be forwarded */ /* TRUE if EOS buffers shouldn't be forwarded */
gboolean draining; gboolean draining;

30
omx/gstomxrecmutex.c
View file

@ -27,58 +27,58 @@
void void
gst_omx_rec_mutex_init (GstOMXRecMutex * mutex) gst_omx_rec_mutex_init (GstOMXRecMutex * mutex)
{ {
mutex->lock = g_mutex_new (); g_mutex_init (&mutex->lock);
mutex->recursion_lock = g_mutex_new (); g_mutex_init (&mutex->recursion_lock);
mutex->recursion_allowed = FALSE; mutex->recursion_allowed = FALSE;
} }
void void
gst_omx_rec_mutex_clear (GstOMXRecMutex * mutex) gst_omx_rec_mutex_clear (GstOMXRecMutex * mutex)
{ {
g_mutex_free (mutex->lock); g_mutex_clear (&mutex->lock);
g_mutex_free (mutex->recursion_lock); g_mutex_clear (&mutex->recursion_lock);
} }
void void
gst_omx_rec_mutex_lock (GstOMXRecMutex * mutex) gst_omx_rec_mutex_lock (GstOMXRecMutex * mutex)
{ {
g_mutex_lock (mutex->lock); g_mutex_lock (&mutex->lock);
} }
void void
gst_omx_rec_mutex_unlock (GstOMXRecMutex * mutex) gst_omx_rec_mutex_unlock (GstOMXRecMutex * mutex)
{ {
g_mutex_unlock (mutex->lock); g_mutex_unlock (&mutex->lock);
} }
/* must be called with mutex->lock taken */ /* must be called with mutex->lock taken */
void void
gst_omx_rec_mutex_begin_recursion (GstOMXRecMutex * mutex) gst_omx_rec_mutex_begin_recursion (GstOMXRecMutex * mutex)
{ {
g_mutex_lock (mutex->recursion_lock); g_mutex_lock (&mutex->recursion_lock);
g_assert (mutex->recursion_allowed == FALSE); g_assert (mutex->recursion_allowed == FALSE);
mutex->recursion_allowed = TRUE; mutex->recursion_allowed = TRUE;
g_mutex_unlock (mutex->recursion_lock); g_mutex_unlock (&mutex->recursion_lock);
} }
/* must be called with mutex->lock taken */ /* must be called with mutex->lock taken */
void void
gst_omx_rec_mutex_end_recursion (GstOMXRecMutex * mutex) gst_omx_rec_mutex_end_recursion (GstOMXRecMutex * mutex)
{ {
g_mutex_lock (mutex->recursion_lock); g_mutex_lock (&mutex->recursion_lock);
g_assert (mutex->recursion_allowed == TRUE); g_assert (mutex->recursion_allowed == TRUE);
mutex->recursion_allowed = FALSE; mutex->recursion_allowed = FALSE;
g_mutex_unlock (mutex->recursion_lock); g_mutex_unlock (&mutex->recursion_lock);
} }
void void
gst_omx_rec_mutex_recursive_lock (GstOMXRecMutex * mutex) gst_omx_rec_mutex_recursive_lock (GstOMXRecMutex * mutex)
{ {
g_mutex_lock (mutex->recursion_lock); g_mutex_lock (&mutex->recursion_lock);
if (!mutex->recursion_allowed) { if (!mutex->recursion_allowed) {
/* no recursion allowed, lock the proper mutex */ /* no recursion allowed, lock the proper mutex */
g_mutex_unlock (mutex->recursion_lock); g_mutex_unlock (&mutex->recursion_lock);
g_mutex_lock (mutex->lock); g_mutex_lock (&mutex->lock);
} }
} }
@ -90,8 +90,8 @@ gst_omx_rec_mutex_recursive_unlock (GstOMXRecMutex * mutex)
* either lock protects it from being changed. * either lock protects it from being changed.
*/ */
if (mutex->recursion_allowed) { if (mutex->recursion_allowed) {
g_mutex_unlock (mutex->recursion_lock); g_mutex_unlock (&mutex->recursion_lock);
} else { } else {
g_mutex_unlock (mutex->lock); g_mutex_unlock (&mutex->lock);
} }
} }

4
omx/gstomxrecmutex.h
View file

@ -78,13 +78,13 @@ typedef struct _GstOMXRecMutex GstOMXRecMutex;
struct _GstOMXRecMutex { struct _GstOMXRecMutex {
/* The master lock */ /* The master lock */
GMutex *lock; GMutex lock;
/* This lock is taken when recursing. /* This lock is taken when recursing.
* The master lock must always be taken before this one, * The master lock must always be taken before this one,
* by the caller of _begin_recursion(). * by the caller of _begin_recursion().
*/ */
GMutex *recursion_lock; GMutex recursion_lock;
/* Indicates whether recursion is allowed. /* Indicates whether recursion is allowed.
* When it is allowed, _recursive_lock() takes * When it is allowed, _recursive_lock() takes

36
omx/gstomxvideodec.c
View file

@ -118,8 +118,8 @@ gst_omx_video_dec_init (GstOMXVideoDec * self)
{ {
gst_video_decoder_set_packetized (GST_VIDEO_DECODER (self), TRUE); gst_video_decoder_set_packetized (GST_VIDEO_DECODER (self), TRUE);
self->drain_lock = g_mutex_new (); g_mutex_init (&self->drain_lock);
self->drain_cond = g_cond_new (); g_cond_init (&self->drain_cond);
} }
static gboolean static gboolean
@ -205,8 +205,8 @@ gst_omx_video_dec_finalize (GObject * object)
{ {
GstOMXVideoDec *self = GST_OMX_VIDEO_DEC (object); GstOMXVideoDec *self = GST_OMX_VIDEO_DEC (object);
g_mutex_free (self->drain_lock); g_mutex_clear (&self->drain_lock);
g_cond_free (self->drain_cond); g_cond_clear (&self->drain_cond);
G_OBJECT_CLASS (gst_omx_video_dec_parent_class)->finalize (object); G_OBJECT_CLASS (gst_omx_video_dec_parent_class)->finalize (object);
} }
@ -241,10 +241,10 @@ gst_omx_video_dec_change_state (GstElement * element, GstStateChange transition)
if (self->out_port) if (self->out_port)
gst_omx_port_set_flushing (self->out_port, TRUE); gst_omx_port_set_flushing (self->out_port, TRUE);
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
break; break;
default: default:
break; break;
@ -658,16 +658,16 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
} }
if (is_eos || flow_ret == GST_FLOW_EOS) { if (is_eos || flow_ret == GST_FLOW_EOS) {
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");
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
} else if (flow_ret == GST_FLOW_OK) { } else if (flow_ret == GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "Component signalled EOS"); GST_DEBUG_OBJECT (self, "Component signalled EOS");
flow_ret = GST_FLOW_EOS; flow_ret = GST_FLOW_EOS;
} }
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
} else { } else {
GST_DEBUG_OBJECT (self, "Finished frame: %s", GST_DEBUG_OBJECT (self, "Finished frame: %s",
gst_flow_get_name (flow_ret)); gst_flow_get_name (flow_ret));
@ -805,10 +805,10 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
self->started = FALSE; self->started = FALSE;
self->eos = FALSE; self->eos = FALSE;
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
gst_omx_component_get_state (self->component, 5 * GST_SECOND); gst_omx_component_get_state (self->component, 5 * GST_SECOND);
@ -1378,7 +1378,7 @@ gst_omx_video_dec_drain (GstOMXVideoDec * self, gboolean is_eos)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = TRUE; self->draining = TRUE;
buf->omx_buf->nFilledLen = 0; buf->omx_buf->nFilledLen = 0;
buf->omx_buf->nTimeStamp = buf->omx_buf->nTimeStamp =
@ -1390,19 +1390,19 @@ gst_omx_video_dec_drain (GstOMXVideoDec * self, gboolean is_eos)
GST_DEBUG_OBJECT (self, "Waiting until component is drained"); GST_DEBUG_OBJECT (self, "Waiting until component is drained");
if (G_UNLIKELY (self->component->hacks & GST_OMX_HACK_DRAIN_MAY_NOT_RETURN)) { if (G_UNLIKELY (self->component->hacks & GST_OMX_HACK_DRAIN_MAY_NOT_RETURN)) {
GTimeVal tv = {.tv_sec = 0,.tv_usec = 500000 }; gint64 wait_until = g_get_monotonic_time () + G_TIME_SPAN_SECOND / 2;
if (!g_cond_timed_wait (self->drain_cond, self->drain_lock, &tv)) if (!g_cond_wait_until (&self->drain_cond, &self->drain_lock, wait_until))
GST_WARNING_OBJECT (self, "Drain timed out"); GST_WARNING_OBJECT (self, "Drain timed out");
else else
GST_DEBUG_OBJECT (self, "Drained component"); GST_DEBUG_OBJECT (self, "Drained component");
} else { } else {
g_cond_wait (self->drain_cond, self->drain_lock); g_cond_wait (&self->drain_cond, &self->drain_lock);
GST_DEBUG_OBJECT (self, "Drained component"); GST_DEBUG_OBJECT (self, "Drained component");
} }
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
GST_VIDEO_DECODER_STREAM_LOCK (self); GST_VIDEO_DECODER_STREAM_LOCK (self);
self->started = FALSE; self->started = FALSE;

4
omx/gstomxvideodec.h
View file

@ -63,8 +63,8 @@ struct _GstOMXVideoDec
GstClockTime last_upstream_ts; GstClockTime last_upstream_ts;
/* Draining state */ /* Draining state */
GMutex *drain_lock; GMutex drain_lock;
GCond *drain_cond; GCond drain_cond;
/* TRUE if EOS buffers shouldn't be forwarded */ /* TRUE if EOS buffers shouldn't be forwarded */
gboolean draining; gboolean draining;

32
omx/gstomxvideoenc.c
View file

@ -206,8 +206,8 @@ gst_omx_video_enc_init (GstOMXVideoEnc * self)
self->quant_p_frames = GST_OMX_VIDEO_ENC_QUANT_P_FRAMES_DEFAULT; self->quant_p_frames = GST_OMX_VIDEO_ENC_QUANT_P_FRAMES_DEFAULT;
self->quant_b_frames = GST_OMX_VIDEO_ENC_QUANT_B_FRAMES_DEFAULT; self->quant_b_frames = GST_OMX_VIDEO_ENC_QUANT_B_FRAMES_DEFAULT;
self->drain_lock = g_mutex_new (); g_mutex_init (&self->drain_lock);
self->drain_cond = g_cond_new (); g_cond_init (&self->drain_cond);
} }
static gboolean static gboolean
@ -371,8 +371,8 @@ gst_omx_video_enc_finalize (GObject * object)
{ {
GstOMXVideoEnc *self = GST_OMX_VIDEO_ENC (object); GstOMXVideoEnc *self = GST_OMX_VIDEO_ENC (object);
g_mutex_free (self->drain_lock); g_mutex_clear (&self->drain_lock);
g_cond_free (self->drain_cond); g_cond_clear (&self->drain_cond);
G_OBJECT_CLASS (gst_omx_video_enc_parent_class)->finalize (object); G_OBJECT_CLASS (gst_omx_video_enc_parent_class)->finalize (object);
} }
@ -479,10 +479,10 @@ gst_omx_video_enc_change_state (GstElement * element, GstStateChange transition)
if (self->out_port) if (self->out_port)
gst_omx_port_set_flushing (self->out_port, TRUE); gst_omx_port_set_flushing (self->out_port, TRUE);
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
break; break;
default: default:
break; break;
@ -769,16 +769,16 @@ gst_omx_video_enc_loop (GstOMXVideoEnc * self)
flow_ret = klass->handle_output_frame (self, self->out_port, buf, frame); flow_ret = klass->handle_output_frame (self, self->out_port, buf, frame);
if (is_eos || flow_ret == GST_FLOW_EOS) { if (is_eos || flow_ret == GST_FLOW_EOS) {
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");
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
} else if (flow_ret == GST_FLOW_OK) { } else if (flow_ret == GST_FLOW_OK) {
GST_DEBUG_OBJECT (self, "Component signalled EOS"); GST_DEBUG_OBJECT (self, "Component signalled EOS");
flow_ret = GST_FLOW_EOS; flow_ret = GST_FLOW_EOS;
} }
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
} else { } else {
GST_DEBUG_OBJECT (self, "Finished frame: %s", GST_DEBUG_OBJECT (self, "Finished frame: %s",
gst_flow_get_name (flow_ret)); gst_flow_get_name (flow_ret));
@ -905,10 +905,10 @@ gst_omx_video_enc_stop (GstVideoEncoder * encoder)
gst_video_codec_state_unref (self->input_state); gst_video_codec_state_unref (self->input_state);
self->input_state = NULL; self->input_state = NULL;
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = FALSE; self->draining = FALSE;
g_cond_broadcast (self->drain_cond); g_cond_broadcast (&self->drain_cond);
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
gst_omx_component_get_state (self->component, 5 * GST_SECOND); gst_omx_component_get_state (self->component, 5 * GST_SECOND);
@ -1439,7 +1439,7 @@ gst_omx_video_enc_drain (GstOMXVideoEnc * self, gboolean at_eos)
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
g_mutex_lock (self->drain_lock); g_mutex_lock (&self->drain_lock);
self->draining = TRUE; self->draining = TRUE;
buf->omx_buf->nFilledLen = 0; buf->omx_buf->nFilledLen = 0;
buf->omx_buf->nTimeStamp = buf->omx_buf->nTimeStamp =
@ -1449,9 +1449,9 @@ gst_omx_video_enc_drain (GstOMXVideoEnc * self, gboolean at_eos)
buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS; buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS;
gst_omx_port_release_buffer (self->in_port, buf); gst_omx_port_release_buffer (self->in_port, buf);
GST_DEBUG_OBJECT (self, "Waiting until component is drained"); GST_DEBUG_OBJECT (self, "Waiting until component is drained");
g_cond_wait (self->drain_cond, self->drain_lock); g_cond_wait (&self->drain_cond, &self->drain_lock);
GST_DEBUG_OBJECT (self, "Drained component"); GST_DEBUG_OBJECT (self, "Drained component");
g_mutex_unlock (self->drain_lock); g_mutex_unlock (&self->drain_lock);
GST_VIDEO_ENCODER_STREAM_LOCK (self); GST_VIDEO_ENCODER_STREAM_LOCK (self);
self->started = FALSE; self->started = FALSE;

4
omx/gstomxvideoenc.h
View file

@ -65,8 +65,8 @@ struct _GstOMXVideoEnc
GstClockTime last_upstream_ts; GstClockTime last_upstream_ts;
/* Draining state */ /* Draining state */
GMutex *drain_lock; GMutex drain_lock;
GCond *drain_cond; GCond drain_cond;
/* TRUE if EOS buffers shouldn't be forwarded */ /* TRUE if EOS buffers shouldn't be forwarded */
gboolean draining; gboolean draining;