From 29ae7109b47764fabf410350e2a9afdb9087b57d Mon Sep 17 00:00:00 2001 From: Costa Shulyupin Date: Thu, 16 Apr 2020 21:58:41 +0300 Subject: [PATCH 1/2] webrtc-sendrecv.c: small cleanup replacing unnecessary temporary variables with expressions to improve readability --- sendrecv/gst/webrtc-sendrecv.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/sendrecv/gst/webrtc-sendrecv.c b/sendrecv/gst/webrtc-sendrecv.c index f2fef12..2a0636e 100644 --- a/sendrecv/gst/webrtc-sendrecv.c +++ b/sendrecv/gst/webrtc-sendrecv.c @@ -259,13 +259,11 @@ static void on_offer_created (GstPromise * promise, gpointer user_data) { GstWebRTCSessionDescription *offer = NULL; - const GstStructure *reply; g_assert_cmphex (app_state, ==, PEER_CALL_NEGOTIATING); g_assert_cmphex (gst_promise_wait (promise), ==, GST_PROMISE_RESULT_REPLIED); - reply = gst_promise_get_reply (promise); - gst_structure_get (reply, "offer", + gst_structure_get (gst_promise_get_reply (promise), "offer", GST_TYPE_WEBRTC_SESSION_DESCRIPTION, &offer, NULL); gst_promise_unref (promise); @@ -284,16 +282,11 @@ on_negotiation_needed (GstElement * element, gpointer user_data) { app_state = PEER_CALL_NEGOTIATING; - if (remote_is_offerer) { - gchar *msg = g_strdup_printf ("OFFER_REQUEST"); - soup_websocket_connection_send_text (ws_conn, msg); - g_free (msg); - } else { - GstPromise *promise; - promise = - gst_promise_new_with_change_func (on_offer_created, user_data, NULL);; - g_signal_emit_by_name (webrtc1, "create-offer", NULL, promise); - } + if (remote_is_offerer) + soup_websocket_connection_send_text (ws_conn, "OFFER_REQUEST"); + else + g_signal_emit_by_name (webrtc1, "create-offer", NULL, + gst_promise_new_with_change_func (on_offer_created, user_data, NULL)); } #define STUN_SERVER " stun-server=stun://stun.l.google.com:19302 " @@ -496,13 +489,11 @@ static void on_answer_created (GstPromise * promise, gpointer user_data) { GstWebRTCSessionDescription *answer = NULL; - const GstStructure *reply; g_assert_cmphex (app_state, ==, PEER_CALL_NEGOTIATING); g_assert_cmphex (gst_promise_wait (promise), ==, GST_PROMISE_RESULT_REPLIED); - reply = gst_promise_get_reply (promise); - gst_structure_get (reply, "answer", + gst_structure_get (gst_promise_get_reply (promise), "answer", GST_TYPE_WEBRTC_SESSION_DESCRIPTION, &answer, NULL); gst_promise_unref (promise); From aae0dd340951333fb032d9d8764b736c53278c30 Mon Sep 17 00:00:00 2001 From: Costa Shulyupin Date: Thu, 16 Apr 2020 23:47:12 +0300 Subject: [PATCH 2/2] webrtc-sendrecv.c: remove unneeded promise Is it indeed redundant or I am missing something? --- sendrecv/gst/webrtc-sendrecv.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/sendrecv/gst/webrtc-sendrecv.c b/sendrecv/gst/webrtc-sendrecv.c index 2a0636e..e16a344 100644 --- a/sendrecv/gst/webrtc-sendrecv.c +++ b/sendrecv/gst/webrtc-sendrecv.c @@ -267,10 +267,7 @@ on_offer_created (GstPromise * promise, gpointer user_data) GST_TYPE_WEBRTC_SESSION_DESCRIPTION, &offer, NULL); gst_promise_unref (promise); - promise = gst_promise_new (); - g_signal_emit_by_name (webrtc1, "set-local-description", offer, promise); - gst_promise_interrupt (promise); - gst_promise_unref (promise); + g_signal_emit_by_name (webrtc1, "set-local-description", offer, NULL); /* Send offer to peer */ send_sdp_to_peer (offer); @@ -497,10 +494,7 @@ on_answer_created (GstPromise * promise, gpointer user_data) GST_TYPE_WEBRTC_SESSION_DESCRIPTION, &answer, NULL); gst_promise_unref (promise); - promise = gst_promise_new (); - g_signal_emit_by_name (webrtc1, "set-local-description", answer, promise); - gst_promise_interrupt (promise); - gst_promise_unref (promise); + g_signal_emit_by_name (webrtc1, "set-local-description", answer, NULL); /* Send answer to peer */ send_sdp_to_peer (answer); @@ -517,12 +511,7 @@ on_offer_received (GstSDPMessage * sdp) g_assert_nonnull (offer); /* Set remote description on our pipeline */ - { - promise = gst_promise_new (); - g_signal_emit_by_name (webrtc1, "set-remote-description", offer, promise); - gst_promise_interrupt (promise); - gst_promise_unref (promise); - } + g_signal_emit_by_name (webrtc1, "set-remote-description", offer, NULL); gst_webrtc_session_description_free (offer); promise = gst_promise_new_with_change_func (on_answer_created, NULL, NULL);