FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

avwait: Don't post messages with the mutex locked

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2063>
This commit is contained in:
Sebastian Dröge 2021-03-09 13:00:10 +02:00
parent 2bed220771
commit 80c1722cba
1 changed files with 91 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
gst/timecode/gstavwait.c
View File

@ -353,7 +353,9 @@ gst_avwait_change_state (GstElement * element, GstStateChange transition)
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:{
gboolean send_message = FALSE;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
if (self->mode != MODE_RUNNING_TIME) { if (self->mode != MODE_RUNNING_TIME) {
GST_DEBUG_OBJECT (self, "First time reset in paused to ready"); GST_DEBUG_OBJECT (self, "First time reset in paused to ready");
@ -364,7 +366,7 @@ gst_avwait_change_state (GstElement * element, GstStateChange transition)
} }
if (!self->dropping) { if (!self->dropping) {
self->dropping = TRUE; self->dropping = TRUE;
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE); send_message = TRUE;
} }
gst_segment_init (&self->asegment, GST_FORMAT_UNDEFINED); gst_segment_init (&self->asegment, GST_FORMAT_UNDEFINED);
self->asegment.position = GST_CLOCK_TIME_NONE; self->asegment.position = GST_CLOCK_TIME_NONE;
@ -377,7 +379,11 @@ gst_avwait_change_state (GstElement * element, GstStateChange transition)
gst_video_time_code_free (self->last_seen_tc); gst_video_time_code_free (self->last_seen_tc);
self->last_seen_tc = NULL; self->last_seen_tc = NULL;
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE);
break; break;
}
default: default:
break; break;
} }
@ -609,7 +615,9 @@ gst_avwait_vsink_event (GstPad * pad, GstObject * parent, GstEvent * event)
GST_LOG_OBJECT (pad, "Got %s event", GST_EVENT_TYPE_NAME (event)); GST_LOG_OBJECT (pad, "Got %s event", GST_EVENT_TYPE_NAME (event));
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEGMENT: case GST_EVENT_SEGMENT:{
gboolean send_message = FALSE;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
gst_event_copy_segment (event, &self->vsegment); gst_event_copy_segment (event, &self->vsegment);
if (self->vsegment.format != GST_FORMAT_TIME) { if (self->vsegment.format != GST_FORMAT_TIME) {
@ -625,16 +633,22 @@ gst_avwait_vsink_event (GstPad * pad, GstObject * parent, GstEvent * event)
self->audio_running_time_to_end_at = GST_CLOCK_TIME_NONE; self->audio_running_time_to_end_at = GST_CLOCK_TIME_NONE;
if (!self->dropping) { if (!self->dropping) {
self->dropping = TRUE; self->dropping = TRUE;
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE); send_message = TRUE;
} }
self->vsegment.position = GST_CLOCK_TIME_NONE; self->vsegment.position = GST_CLOCK_TIME_NONE;
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE);
break; break;
}
case GST_EVENT_GAP: case GST_EVENT_GAP:
gst_event_unref (event); gst_event_unref (event);
return TRUE; return TRUE;
case GST_EVENT_EOS:{ case GST_EVENT_EOS:{
GstClockTime running_time; GstClockTime running_time;
gboolean send_message = FALSE;
GstClockTime audio_running_time_to_end_at;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
self->video_eos_flag = TRUE; self->video_eos_flag = TRUE;
@ -661,15 +675,16 @@ gst_avwait_vsink_event (GstPad * pad, GstObject * parent, GstEvent * event)
if (self->must_send_end_message & END_MESSAGE_AUDIO_PUSHED) { if (self->must_send_end_message & END_MESSAGE_AUDIO_PUSHED) {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex); send_message = TRUE;
gst_avwait_send_element_message (self, TRUE, audio_running_time_to_end_at = self->audio_running_time_to_end_at;
self->audio_running_time_to_end_at);
} else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) { } else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) {
self->must_send_end_message |= END_MESSAGE_VIDEO_PUSHED; self->must_send_end_message |= END_MESSAGE_VIDEO_PUSHED;
g_mutex_unlock (&self->mutex);
} else {
g_mutex_unlock (&self->mutex);
} }
g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE,
audio_running_time_to_end_at);
break; break;
} }
case GST_EVENT_FLUSH_START: case GST_EVENT_FLUSH_START:
@ -678,7 +693,9 @@ gst_avwait_vsink_event (GstPad * pad, GstObject * parent, GstEvent * event)
g_cond_signal (&self->audio_cond); g_cond_signal (&self->audio_cond);
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
break; break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:{
gboolean send_message = FALSE;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
self->video_flush_flag = FALSE; self->video_flush_flag = FALSE;
GST_DEBUG_OBJECT (self, "First time reset in video flush"); GST_DEBUG_OBJECT (self, "First time reset in video flush");
@ -688,12 +705,16 @@ gst_avwait_vsink_event (GstPad * pad, GstObject * parent, GstEvent * event)
self->audio_running_time_to_end_at = GST_CLOCK_TIME_NONE; self->audio_running_time_to_end_at = GST_CLOCK_TIME_NONE;
if (!self->dropping) { if (!self->dropping) {
self->dropping = TRUE; self->dropping = TRUE;
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE); send_message = TRUE;
} }
gst_segment_init (&self->vsegment, GST_FORMAT_UNDEFINED); gst_segment_init (&self->vsegment, GST_FORMAT_UNDEFINED);
self->vsegment.position = GST_CLOCK_TIME_NONE; self->vsegment.position = GST_CLOCK_TIME_NONE;
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE, GST_CLOCK_TIME_NONE);
break; break;
}
case GST_EVENT_CAPS:{ case GST_EVENT_CAPS:{
GstCaps *caps; GstCaps *caps;
gst_event_parse_caps (event, &caps); gst_event_parse_caps (event, &caps);
@ -748,22 +769,27 @@ gst_avwait_asink_event (GstPad * pad, GstObject * parent, GstEvent * event)
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
break; break;
case GST_EVENT_EOS:{ case GST_EVENT_EOS:{
gboolean send_message = FALSE;
GstClockTime audio_running_time_to_end_at;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
self->audio_eos_flag = TRUE; self->audio_eos_flag = TRUE;
g_cond_signal (&self->audio_cond); g_cond_signal (&self->audio_cond);
if ((self->must_send_end_message & END_MESSAGE_VIDEO_PUSHED)) { if ((self->must_send_end_message & END_MESSAGE_VIDEO_PUSHED)) {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex); audio_running_time_to_end_at = self->audio_running_time_to_end_at;
gst_avwait_send_element_message (self, TRUE, send_message = TRUE;
self->audio_running_time_to_end_at);
} else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) { } else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) {
self->must_send_end_message |= END_MESSAGE_AUDIO_PUSHED; self->must_send_end_message |= END_MESSAGE_AUDIO_PUSHED;
g_mutex_unlock (&self->mutex);
} else { } else {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex);
} }
g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE,
audio_running_time_to_end_at);
break; break;
} }
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
@ -803,6 +829,9 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
GstVideoTimeCodeMeta *tc_meta; GstVideoTimeCodeMeta *tc_meta;
gboolean retry = FALSE; gboolean retry = FALSE;
gboolean ret = GST_FLOW_OK; gboolean ret = GST_FLOW_OK;
gboolean send_message = FALSE;
GstClockTime message_running_time;
gboolean message_dropping;
timestamp = GST_BUFFER_TIMESTAMP (inbuf); timestamp = GST_BUFFER_TIMESTAMP (inbuf);
if (timestamp == GST_CLOCK_TIME_NONE) { if (timestamp == GST_CLOCK_TIME_NONE) {
@ -898,8 +927,9 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
inbuf = NULL; inbuf = NULL;
} }
} else if (emit_passthrough_signal && self->recording) { } else if (emit_passthrough_signal && self->recording) {
gst_avwait_send_element_message (self, FALSE, send_message = TRUE;
self->running_time_to_wait_for); message_running_time = self->running_time_to_wait_for;
message_dropping = FALSE;
} }
} }
break; break;
@ -924,8 +954,11 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
if (self->recording) { if (self->recording) {
self->audio_running_time_to_wait_for = running_time; self->audio_running_time_to_wait_for = running_time;
} }
if (self->recording) if (self->recording) {
gst_avwait_send_element_message (self, FALSE, running_time); send_message = TRUE;
message_running_time = running_time;
message_dropping = FALSE;
}
} }
if (GST_CLOCK_TIME_IS_VALID (self->end_running_time) if (GST_CLOCK_TIME_IS_VALID (self->end_running_time)
@ -948,8 +981,9 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
inbuf = NULL; inbuf = NULL;
} }
} else if (emit_passthrough_signal && self->recording) { } else if (emit_passthrough_signal && self->recording) {
gst_avwait_send_element_message (self, FALSE, send_message = TRUE;
self->running_time_to_wait_for); message_running_time = self->running_time_to_wait_for;
message_dropping = FALSE;
} }
break; break;
@ -964,9 +998,11 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
} }
if (self->dropping) { if (self->dropping) {
self->dropping = FALSE; self->dropping = FALSE;
if (self->recording) if (self->recording) {
gst_avwait_send_element_message (self, FALSE, send_message = TRUE;
self->running_time_to_wait_for); message_running_time = self->running_time_to_wait_for;
message_dropping = FALSE;
}
} }
} }
break; break;
@ -1015,7 +1051,9 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
&& running_time > self->running_time_to_wait_for) { && running_time > self->running_time_to_wait_for) {
/* We just started recording: synchronise the audio */ /* We just started recording: synchronise the audio */
self->audio_running_time_to_wait_for = running_time; self->audio_running_time_to_wait_for = running_time;
gst_avwait_send_element_message (self, FALSE, running_time); send_message = TRUE;
message_running_time = running_time;
message_dropping = FALSE;
} else { } else {
/* We will start in the future when running_time_to_wait_for is /* We will start in the future when running_time_to_wait_for is
* reached */ * reached */
@ -1044,6 +1082,11 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
g_cond_signal (&self->cond); g_cond_signal (&self->cond);
g_mutex_unlock (&self->mutex); g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, message_dropping,
message_running_time);
send_message = FALSE;
if (inbuf) { if (inbuf) {
GST_DEBUG_OBJECT (self, GST_DEBUG_OBJECT (self,
"Pass video buffer %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT, "Pass video buffer %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT,
@ -1058,22 +1101,24 @@ gst_avwait_vsink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
if (self->must_send_end_message & END_MESSAGE_AUDIO_PUSHED) { if (self->must_send_end_message & END_MESSAGE_AUDIO_PUSHED) {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex); send_message = TRUE;
gst_avwait_send_element_message (self, TRUE, message_dropping = TRUE;
self->audio_running_time_to_end_at); message_running_time = self->audio_running_time_to_end_at;
} else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) { } else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) {
if (self->audio_eos_flag) { if (self->audio_eos_flag) {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex); send_message = TRUE;
gst_avwait_send_element_message (self, TRUE, message_dropping = TRUE;
self->audio_running_time_to_end_at); message_running_time = self->audio_running_time_to_end_at;
} else { } else {
self->must_send_end_message |= END_MESSAGE_VIDEO_PUSHED; self->must_send_end_message |= END_MESSAGE_VIDEO_PUSHED;
g_mutex_unlock (&self->mutex);
} }
} else {
g_mutex_unlock (&self->mutex);
} }
g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, message_dropping,
message_running_time);
return ret; return ret;
} }
@ -1284,20 +1329,25 @@ gst_avwait_asink_chain (GstPad * pad, GstObject * parent, GstBuffer * inbuf)
} }
if (send_element_message) { if (send_element_message) {
gboolean send_message = FALSE;
GstClockTime audio_running_time_to_end_at;
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
if ((self->must_send_end_message & END_MESSAGE_VIDEO_PUSHED) || if ((self->must_send_end_message & END_MESSAGE_VIDEO_PUSHED) ||
self->video_eos_flag) { self->video_eos_flag) {
self->must_send_end_message = END_MESSAGE_NORMAL; self->must_send_end_message = END_MESSAGE_NORMAL;
g_mutex_unlock (&self->mutex); send_message = TRUE;
gst_avwait_send_element_message (self, TRUE, audio_running_time_to_end_at = self->audio_running_time_to_end_at;
self->audio_running_time_to_end_at);
} else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) { } else if (self->must_send_end_message & END_MESSAGE_STREAM_ENDED) {
self->must_send_end_message |= END_MESSAGE_AUDIO_PUSHED; self->must_send_end_message |= END_MESSAGE_AUDIO_PUSHED;
g_mutex_unlock (&self->mutex);
} else { } else {
g_assert_not_reached (); g_assert_not_reached ();
g_mutex_unlock (&self->mutex);
} }
g_mutex_unlock (&self->mutex);
if (send_message)
gst_avwait_send_element_message (self, TRUE,
audio_running_time_to_end_at);
} }
send_element_message = FALSE; send_element_message = FALSE;
return ret; return ret;