mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
tests: rtprtx::test_rtxsender_packet_retention: fix race condition
Now with rtprtxsend pushing rtx buffers from a different thread, this is necessary to ensure that the result of the test is deterministic. This code makes use of GstCheck's global GMutex and GCond that are being used inside GstCheck's sink pad chain() function in order to synchronize with it.
This commit is contained in:
parent
7011f98d7e
commit
7677aec2fa
1 changed files with 18 additions and 4 deletions
|
@ -1256,12 +1256,26 @@ test_rtxsender_packet_retention (gboolean test_with_time)
|
|||
|
||||
/* retransmit all the previous ones */
|
||||
for (j = 1; j < i; j++) {
|
||||
res = gst_pad_push_event (sinkpad,
|
||||
create_rtx_event (j, ssrc, payload_type));
|
||||
fail_unless_equals_int (res, TRUE);
|
||||
/* synchronize with the chain() function of the "sinkpad"
|
||||
* to make sure that rtxsend has pushed the rtx buffer out
|
||||
* before continuing */
|
||||
GList *last_out_buffer = g_list_last (buffers);
|
||||
g_mutex_lock (&check_mutex);
|
||||
fail_unless_equals_int (gst_pad_push_event (sinkpad,
|
||||
create_rtx_event (j, ssrc, payload_type)), TRUE);
|
||||
/* wait for the rtx packet only if we expect the element
|
||||
* to actually retransmit something */
|
||||
if (j >= MAX (i - half_buffers, 1)) {
|
||||
guint64 end_time = g_get_monotonic_time () + G_TIME_SPAN_SECOND;
|
||||
do
|
||||
res = g_cond_wait_until (&check_cond, &check_mutex, end_time);
|
||||
while (res == TRUE && last_out_buffer == g_list_last (buffers));
|
||||
fail_unless_equals_int (res, TRUE);
|
||||
}
|
||||
g_mutex_unlock (&check_mutex);
|
||||
}
|
||||
|
||||
/* push this one, triggering the retransmit in rtxsend's chain() function */
|
||||
/* push this one */
|
||||
gst_pad_push (srcpad, gst_buffer_ref (buffer));
|
||||
node = g_list_next (node);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue