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

clock: Move clock weak ref into its own ABI struct

Browse source 
Otherwise it will be hard to add other things into the padding later
without breaking API.
This commit is contained in:
Sebastian Dröge 2018-11-03 18:44:48 +02:00
parent 4de89865d4
commit 8250b8d81a
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/gstclock.c
View file

@ -256,7 +256,7 @@ gst_clock_entry_new (GstClock * clock, GstClockTime time,
entry->_clock = clock; entry->_clock = clock;
#endif #endif
#endif #endif
g_weak_ref_init (&entry->ABI.clock, clock); g_weak_ref_init (&entry->ABI.abi.clock, clock);
entry->type = type; entry->type = type;
entry->time = time; entry->time = time;
entry->interval = interval; entry->interval = interval;
@ -362,7 +362,7 @@ _gst_clock_id_free (GstClockID id)
if (entry->destroy_data) if (entry->destroy_data)
entry->destroy_data (entry->user_data); entry->destroy_data (entry->user_data);
g_weak_ref_clear (&entry->ABI.clock); g_weak_ref_clear (&entry->ABI.abi.clock);
/* FIXME: add tracer hook for struct allocations such as clock entries */ /* FIXME: add tracer hook for struct allocations such as clock entries */
@ -536,7 +536,7 @@ gst_clock_id_wait (GstClockID id, GstClockTimeDiff * jitter)
entry = (GstClockEntry *) id; entry = (GstClockEntry *) id;
requested = GST_CLOCK_ENTRY_TIME (entry); requested = GST_CLOCK_ENTRY_TIME (entry);
clock = g_weak_ref_get (&entry->ABI.clock); clock = g_weak_ref_get (&entry->ABI.abi.clock);
if (G_UNLIKELY (clock == NULL)) if (G_UNLIKELY (clock == NULL))
goto invalid_entry; goto invalid_entry;
@ -620,7 +620,7 @@ gst_clock_id_wait_async (GstClockID id,
entry = (GstClockEntry *) id; entry = (GstClockEntry *) id;
requested = GST_CLOCK_ENTRY_TIME (entry); requested = GST_CLOCK_ENTRY_TIME (entry);
clock = g_weak_ref_get (&entry->ABI.clock); clock = g_weak_ref_get (&entry->ABI.abi.clock);
if (G_UNLIKELY (clock == NULL)) if (G_UNLIKELY (clock == NULL))
goto invalid_entry; goto invalid_entry;
@ -685,7 +685,7 @@ gst_clock_id_unschedule (GstClockID id)
g_return_if_fail (id != NULL); g_return_if_fail (id != NULL);
entry = (GstClockEntry *) id; entry = (GstClockEntry *) id;
clock = g_weak_ref_get (&entry->ABI.clock); clock = g_weak_ref_get (&entry->ABI.abi.clock);
if (G_UNLIKELY (clock == NULL)) if (G_UNLIKELY (clock == NULL))
goto invalid_entry; goto invalid_entry;
@ -1400,7 +1400,7 @@ gst_clock_id_get_clock (GstClockID id)
g_return_val_if_fail (id != NULL, NULL); g_return_val_if_fail (id != NULL, NULL);
entry = (GstClockEntry *) id; entry = (GstClockEntry *) id;
return g_weak_ref_get (&entry->ABI.clock); return g_weak_ref_get (&entry->ABI.abi.clock);
} }
/** /**
@ -1430,7 +1430,7 @@ gst_clock_id_uses_clock (GstClockID id, GstClock * clock)
g_return_val_if_fail (clock != NULL, FALSE); g_return_val_if_fail (clock != NULL, FALSE);
entry = (GstClockEntry *) id; entry = (GstClockEntry *) id;
entry_clock = g_weak_ref_get (&entry->ABI.clock); entry_clock = g_weak_ref_get (&entry->ABI.abi.clock);
if (entry_clock == clock) if (entry_clock == clock)
ret = TRUE; ret = TRUE;

4
gst/gstclock.h
View file

@ -412,7 +412,9 @@ struct _GstClockEntry {
/*< private >*/ /*< private >*/
union { union {
gpointer _gst_reserved[GST_PADDING]; gpointer _gst_reserved[GST_PADDING];
GWeakRef clock; struct {
GWeakRef clock;
} abi;
} ABI; } ABI;
}; };