mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

webrtcbin: Move GstPromise reply to operation framework

Browse source 
This makes it possible to reply to all promises in a consistent way
without having to do a unlock/relock that is always risky.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2104>
This commit is contained in:
Olivier Crête 2021-04-01 14:51:30 -04:00
parent 38ef12063d
commit 12ab469ad3
3 changed files with 47 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
ext/webrtc/gstwebrtcbin.c
View file

@ -757,6 +757,8 @@ _stop_thread (GstWebRTCBin * webrtc)
static gboolean static gboolean
_execute_op (GstWebRTCBinTask * op) _execute_op (GstWebRTCBinTask * op)
{ {
GstStructure *s;
PC_LOCK (op->webrtc); PC_LOCK (op->webrtc);
if (op->webrtc->priv->is_closed) { if (op->webrtc->priv->is_closed) {
PC_UNLOCK (op->webrtc); PC_UNLOCK (op->webrtc);
@ -778,10 +780,15 @@ _execute_op (GstWebRTCBinTask * op)
goto out; goto out;
} }
op->op (op->webrtc, op->data); s = op->op (op->webrtc, op->data);
PC_UNLOCK (op->webrtc); PC_UNLOCK (op->webrtc);
if (op->promise)
gst_promise_reply (op->promise, s);
else if (s)
gst_structure_free (s);
out: out:
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -1126,7 +1133,7 @@ _collate_peer_connection_states (GstWebRTCBin * webrtc)
#undef STATE #undef STATE
} }
static void static GstStructure *
_update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data) _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
{ {
GstWebRTCICEGatheringState old_state = webrtc->ice_gathering_state; GstWebRTCICEGatheringState old_state = webrtc->ice_gathering_state;
@ -1164,6 +1171,8 @@ _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
g_object_notify (G_OBJECT (webrtc), "ice-gathering-state"); g_object_notify (G_OBJECT (webrtc), "ice-gathering-state");
PC_LOCK (webrtc); PC_LOCK (webrtc);
} }
return NULL;
} }
static void static void
@ -1173,7 +1182,7 @@ _update_ice_gathering_state (GstWebRTCBin * webrtc)
NULL, NULL); NULL, NULL);
} }
static void static GstStructure *
_update_ice_connection_state_task (GstWebRTCBin * webrtc, gpointer data) _update_ice_connection_state_task (GstWebRTCBin * webrtc, gpointer data)
{ {
GstWebRTCICEConnectionState old_state = webrtc->ice_connection_state; GstWebRTCICEConnectionState old_state = webrtc->ice_connection_state;
@ -1199,6 +1208,8 @@ _update_ice_connection_state_task (GstWebRTCBin * webrtc, gpointer data)
g_object_notify (G_OBJECT (webrtc), "ice-connection-state"); g_object_notify (G_OBJECT (webrtc), "ice-connection-state");
PC_LOCK (webrtc); PC_LOCK (webrtc);
} }
return NULL;
} }
static void static void
@ -1208,7 +1219,7 @@ _update_ice_connection_state (GstWebRTCBin * webrtc)
NULL, NULL); NULL, NULL);
} }
static void static GstStructure *
_update_peer_connection_state_task (GstWebRTCBin * webrtc, gpointer data) _update_peer_connection_state_task (GstWebRTCBin * webrtc, gpointer data)
{ {
GstWebRTCPeerConnectionState old_state = webrtc->peer_connection_state; GstWebRTCPeerConnectionState old_state = webrtc->peer_connection_state;
@ -1234,6 +1245,8 @@ _update_peer_connection_state_task (GstWebRTCBin * webrtc, gpointer data)
g_object_notify (G_OBJECT (webrtc), "connection-state"); g_object_notify (G_OBJECT (webrtc), "connection-state");
PC_LOCK (webrtc); PC_LOCK (webrtc);
} }
return NULL;
} }
static void static void
@ -1438,7 +1451,7 @@ _check_if_negotiation_is_needed (GstWebRTCBin * webrtc)
return FALSE; return FALSE;
} }
static void static GstStructure *
_check_need_negotiation_task (GstWebRTCBin * webrtc, gpointer unused) _check_need_negotiation_task (GstWebRTCBin * webrtc, gpointer unused)
{ {
if (webrtc->priv->need_negotiation) { if (webrtc->priv->need_negotiation) {
@ -1448,6 +1461,8 @@ _check_need_negotiation_task (GstWebRTCBin * webrtc, gpointer unused)
0); 0);
PC_LOCK (webrtc); PC_LOCK (webrtc);
} }
return NULL;
} }
/* http://w3c.github.io/webrtc-pc/#dfn-update-the-negotiation-needed-flag */ /* http://w3c.github.io/webrtc-pc/#dfn-update-the-negotiation-needed-flag */
@ -2043,7 +2058,7 @@ _on_sctp_state_notify (GstWebRTCSCTPTransport * sctp, GParamSpec * pspec,
static void _on_sctp_notify_dtls_state (GstWebRTCDTLSTransport * transport, static void _on_sctp_notify_dtls_state (GstWebRTCDTLSTransport * transport,
GParamSpec * pspec, GstWebRTCBin * webrtc); GParamSpec * pspec, GstWebRTCBin * webrtc);
static void static GstStructure *
_sctp_check_dtls_state_task (GstWebRTCBin * webrtc, gpointer unused) _sctp_check_dtls_state_task (GstWebRTCBin * webrtc, gpointer unused)
{ {
TransportStream *stream; TransportStream *stream;
@ -2059,7 +2074,7 @@ _sctp_check_dtls_state_task (GstWebRTCBin * webrtc, gpointer unused)
if (dtls_state != GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTED) { if (dtls_state != GST_WEBRTC_DTLS_TRANSPORT_STATE_CONNECTED) {
GST_DEBUG_OBJECT (webrtc, GST_DEBUG_OBJECT (webrtc,
"Data channel DTLS connection is not ready yet: %d", dtls_state); "Data channel DTLS connection is not ready yet: %d", dtls_state);
return; return NULL;
} }
GST_DEBUG_OBJECT (webrtc, "Data channel DTLS connection is now ready"); GST_DEBUG_OBJECT (webrtc, "Data channel DTLS connection is now ready");
@ -2067,7 +2082,7 @@ _sctp_check_dtls_state_task (GstWebRTCBin * webrtc, gpointer unused)
/* Not locked state anymore so this was already taken care of before */ /* Not locked state anymore so this was already taken care of before */
if (!gst_element_is_locked_state (sctp_transport->sctpdec)) if (!gst_element_is_locked_state (sctp_transport->sctpdec))
return; return NULL;
/* Start up the SCTP elements now that the DTLS connection is established */ /* Start up the SCTP elements now that the DTLS connection is established */
gst_element_set_locked_state (sctp_transport->sctpdec, FALSE); gst_element_set_locked_state (sctp_transport->sctpdec, FALSE);
@ -2090,6 +2105,8 @@ _sctp_check_dtls_state_task (GstWebRTCBin * webrtc, gpointer unused)
g_signal_handlers_disconnect_by_func (transport, _on_sctp_notify_dtls_state, g_signal_handlers_disconnect_by_func (transport, _on_sctp_notify_dtls_state,
webrtc); webrtc);
return NULL;
} }
static void static void
@ -3121,7 +3138,7 @@ out:
return ret; return ret;
cancel_offer: cancel_offer:
gst_sdp_message_uninit (ret); gst_sdp_message_free (ret);
ret = NULL; ret = NULL;
goto out; goto out;
} }
@ -3698,11 +3715,10 @@ out:
struct create_sdp struct create_sdp
{ {
GstStructure *options; GstStructure *options;
GstPromise *promise;
GstWebRTCSDPType type; GstWebRTCSDPType type;
}; };
static void static GstStructure *
_create_sdp_task (GstWebRTCBin * webrtc, struct create_sdp *data) _create_sdp_task (GstWebRTCBin * webrtc, struct create_sdp *data)
{ {
GstWebRTCSessionDescription *desc = NULL; GstWebRTCSessionDescription *desc = NULL;
@ -3737,12 +3753,11 @@ _create_sdp_task (GstWebRTCBin * webrtc, struct create_sdp *data)
} }
out: out:
PC_UNLOCK (webrtc);
gst_promise_reply (data->promise, s);
PC_LOCK (webrtc);
if (desc) if (desc)
gst_webrtc_session_description_free (desc); gst_webrtc_session_description_free (desc);
return s;
} }
static void static void
@ -3750,7 +3765,6 @@ _free_create_sdp_data (struct create_sdp *data)
{ {
if (data->options) if (data->options)
gst_structure_free (data->options); gst_structure_free (data->options);
gst_promise_unref (data->promise);
g_free (data); g_free (data);
} }
@ -3762,7 +3776,6 @@ gst_webrtc_bin_create_offer (GstWebRTCBin * webrtc,
if (options) if (options)
data->options = gst_structure_copy (options); data->options = gst_structure_copy (options);
data->promise = gst_promise_ref (promise);
data->type = GST_WEBRTC_SDP_TYPE_OFFER; data->type = GST_WEBRTC_SDP_TYPE_OFFER;
if (!gst_webrtc_bin_enqueue_task (webrtc, (GstWebRTCBinFunc) _create_sdp_task, if (!gst_webrtc_bin_enqueue_task (webrtc, (GstWebRTCBinFunc) _create_sdp_task,
@ -3788,7 +3801,6 @@ gst_webrtc_bin_create_answer (GstWebRTCBin * webrtc,
if (options) if (options)
data->options = gst_structure_copy (options); data->options = gst_structure_copy (options);
data->promise = gst_promise_ref (promise);
data->type = GST_WEBRTC_SDP_TYPE_ANSWER; data->type = GST_WEBRTC_SDP_TYPE_ANSWER;
if (!gst_webrtc_bin_enqueue_task (webrtc, (GstWebRTCBinFunc) _create_sdp_task, if (!gst_webrtc_bin_enqueue_task (webrtc, (GstWebRTCBinFunc) _create_sdp_task,
@ -4810,7 +4822,6 @@ check_locked_mlines (GstWebRTCBin * webrtc, GstWebRTCSessionDescription * sdp,
struct set_description struct set_description
{ {
GstPromise *promise;
SDPSource source; SDPSource source;
GstWebRTCSessionDescription *sdp; GstWebRTCSessionDescription *sdp;
}; };
@ -4840,7 +4851,7 @@ get_previous_description (GstWebRTCBin * webrtc, SDPSource source,
} }
/* http://w3c.github.io/webrtc-pc/#set-description */ /* http://w3c.github.io/webrtc-pc/#set-description */
static void static GstStructure *
_set_description_task (GstWebRTCBin * webrtc, struct set_description *sd) _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
{ {
GstWebRTCSignalingState new_signaling_state = webrtc->signaling_state; GstWebRTCSignalingState new_signaling_state = webrtc->signaling_state;
@ -5213,24 +5224,20 @@ _set_description_task (GstWebRTCBin * webrtc, struct set_description *sd)
out: out:
g_strfreev (bundled); g_strfreev (bundled);
PC_UNLOCK (webrtc);
if (error) { if (error) {
GstStructure *s = gst_structure_new ("application/x-gstwebrtcbin-error",
"error", G_TYPE_ERROR, error, NULL);
GST_WARNING_OBJECT (webrtc, "returning error: %s", error->message); GST_WARNING_OBJECT (webrtc, "returning error: %s", error->message);
gst_promise_reply (sd->promise,
gst_structure_new ("application/x-gstwebrtcbin-error", "error",
G_TYPE_ERROR, error, NULL));
g_clear_error (&error); g_clear_error (&error);
return s;
} else { } else {
gst_promise_reply (sd->promise, NULL); return NULL;
} }
PC_LOCK (webrtc);
} }
static void static void
_free_set_description_data (struct set_description *sd) _free_set_description_data (struct set_description *sd)
{ {
if (sd->promise)
gst_promise_unref (sd->promise);
if (sd->sdp) if (sd->sdp)
gst_webrtc_session_description_free (sd->sdp); gst_webrtc_session_description_free (sd->sdp);
g_free (sd); g_free (sd);
@ -5248,8 +5255,6 @@ gst_webrtc_bin_set_remote_description (GstWebRTCBin * webrtc,
goto bad_input; goto bad_input;
sd = g_new0 (struct set_description, 1); sd = g_new0 (struct set_description, 1);
if (promise != NULL)
sd->promise = gst_promise_ref (promise);
sd->source = SDP_REMOTE; sd->source = SDP_REMOTE;
sd->sdp = gst_webrtc_session_description_copy (remote_sdp); sd->sdp = gst_webrtc_session_description_copy (remote_sdp);
@ -5289,8 +5294,6 @@ gst_webrtc_bin_set_local_description (GstWebRTCBin * webrtc,
goto bad_input; goto bad_input;
sd = g_new0 (struct set_description, 1); sd = g_new0 (struct set_description, 1);
if (promise != NULL)
sd->promise = gst_promise_ref (promise);
sd->source = SDP_LOCAL; sd->source = SDP_LOCAL;
sd->sdp = gst_webrtc_session_description_copy (local_sdp); sd->sdp = gst_webrtc_session_description_copy (local_sdp);
@ -5318,7 +5321,7 @@ bad_input:
} }
} }
static void static GstStructure *
_add_ice_candidate_task (GstWebRTCBin * webrtc, IceCandidateItem * item) _add_ice_candidate_task (GstWebRTCBin * webrtc, IceCandidateItem * item)
{ {
if (!webrtc->current_local_description || !webrtc->current_remote_description) { if (!webrtc->current_local_description || !webrtc->current_remote_description) {
@ -5332,6 +5335,8 @@ _add_ice_candidate_task (GstWebRTCBin * webrtc, IceCandidateItem * item)
} else { } else {
_add_ice_candidate (webrtc, item, FALSE); _add_ice_candidate (webrtc, item, FALSE);
} }
return NULL;
} }
static void static void
@ -5360,7 +5365,7 @@ gst_webrtc_bin_add_ice_candidate (GstWebRTCBin * webrtc, guint mline,
(GDestroyNotify) _free_ice_candidate_item, NULL); (GDestroyNotify) _free_ice_candidate_item, NULL);
} }
static void static GstStructure *
_on_local_ice_candidate_task (GstWebRTCBin * webrtc) _on_local_ice_candidate_task (GstWebRTCBin * webrtc)
{ {
gsize i; gsize i;
@ -5370,7 +5375,7 @@ _on_local_ice_candidate_task (GstWebRTCBin * webrtc)
if (webrtc->priv->pending_local_ice_candidates->len == 0) { if (webrtc->priv->pending_local_ice_candidates->len == 0) {
ICE_UNLOCK (webrtc); ICE_UNLOCK (webrtc);
GST_LOG_OBJECT (webrtc, "No ICE candidates to process right now"); GST_LOG_OBJECT (webrtc, "No ICE candidates to process right now");
return; /* Nothing to process */ return NULL; /* Nothing to process */
} }
/* Take the array so we can process it all and free it later /* Take the array so we can process it all and free it later
* without holding the lock * without holding the lock
@ -5417,6 +5422,8 @@ _on_local_ice_candidate_task (GstWebRTCBin * webrtc)
} }
g_array_free (items, TRUE); g_array_free (items, TRUE);
return NULL;
} }
static void static void
@ -5462,19 +5469,14 @@ _free_get_stats (struct get_stats *stats)
} }
/* https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-getstats() */ /* https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-getstats() */
static void static GstStructure *
_get_stats_task (GstWebRTCBin * webrtc, struct get_stats *stats) _get_stats_task (GstWebRTCBin * webrtc, struct get_stats *stats)
{ {
GstStructure *s;
/* Our selector is the pad, /* Our selector is the pad,
* https://www.w3.org/TR/webrtc/#dfn-stats-selection-algorithm * https://www.w3.org/TR/webrtc/#dfn-stats-selection-algorithm
*/ */
s = gst_webrtc_bin_create_stats (webrtc, stats->pad); return gst_webrtc_bin_create_stats (webrtc, stats->pad);
PC_UNLOCK (webrtc);
gst_promise_reply (stats->promise, s);
PC_LOCK (webrtc);
} }
static void static void

2
ext/webrtc/gstwebrtcbin.h
View file

@ -140,7 +140,7 @@ struct _GstWebRTCBinPrivate
gboolean tos_attached; gboolean tos_attached;
}; };
typedef void (*GstWebRTCBinFunc) (GstWebRTCBin * webrtc, gpointer data); typedef GstStructure *(*GstWebRTCBinFunc) (GstWebRTCBin * webrtc, gpointer data);
typedef struct typedef struct
{ {

4
ext/webrtc/webrtcdatachannel.c
View file

@ -221,11 +221,13 @@ struct task
GDestroyNotify notify; GDestroyNotify notify;
}; };
static void static GstStructure *
_execute_task (GstWebRTCBin * webrtc, struct task *task) _execute_task (GstWebRTCBin * webrtc, struct task *task)
{ {
if (task->func) if (task->func)
task->func (task->channel, task->user_data); task->func (task->channel, task->user_data);
return NULL;
} }
static void static void