From 7d2844b2b0d3776e3c9e153122fc30861b9ea694 Mon Sep 17 00:00:00 2001 From: trilene Date: Thu, 10 Sep 2020 14:29:25 -0400 Subject: [PATCH 1/2] Fix earlier commit when GStreamer < v1.17 --- src/WebRTCSession.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/WebRTCSession.cpp b/src/WebRTCSession.cpp index f5dc49d8..96fd8f07 100644 --- a/src/WebRTCSession.cpp +++ b/src/WebRTCSession.cpp @@ -233,6 +233,8 @@ addLocalICECandidate(GstElement *webrtc G_GNUC_UNUSED, return; } + localcandidates_.push_back({"audio", (uint16_t)mlineIndex, candidate}); + // GStreamer v1.16: webrtcbin's notify::ice-gathering-state triggers // GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE too early. Fixed in v1.17. // Use a 100ms timeout in the meantime From b6563d9ffe36fff46b72c0d0da2104a6aeccadab Mon Sep 17 00:00:00 2001 From: trilene Date: Thu, 10 Sep 2020 14:34:10 -0400 Subject: [PATCH 2/2] GStreamer v1.18.0 released --- src/WebRTCSession.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WebRTCSession.cpp b/src/WebRTCSession.cpp index 96fd8f07..1c1d008d 100644 --- a/src/WebRTCSession.cpp +++ b/src/WebRTCSession.cpp @@ -176,7 +176,7 @@ createAnswer(GstPromise *promise, gpointer webrtc) g_signal_emit_by_name(webrtc, "create-answer", nullptr, promise); } -#if GST_CHECK_VERSION(1, 17, 0) +#if GST_CHECK_VERSION(1, 18, 0) void iceGatheringStateChanged(GstElement *webrtc, GParamSpec *pspec G_GNUC_UNUSED, @@ -223,7 +223,7 @@ addLocalICECandidate(GstElement *webrtc G_GNUC_UNUSED, { nhlog::ui()->debug("WebRTC: local candidate: (m-line:{}):{}", mlineIndex, candidate); -#if GST_CHECK_VERSION(1, 17, 0) +#if GST_CHECK_VERSION(1, 18, 0) localcandidates_.push_back({"audio", (uint16_t)mlineIndex, candidate}); return; #else @@ -236,7 +236,7 @@ addLocalICECandidate(GstElement *webrtc G_GNUC_UNUSED, localcandidates_.push_back({"audio", (uint16_t)mlineIndex, candidate}); // GStreamer v1.16: webrtcbin's notify::ice-gathering-state triggers - // GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE too early. Fixed in v1.17. + // GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE too early. Fixed in v1.18. // Use a 100ms timeout in the meantime static guint timerid = 0; if (timerid) @@ -474,7 +474,7 @@ WebRTCSession::startPipeline(int opusPayloadType) gst_element_set_state(pipe_, GST_STATE_READY); g_signal_connect(webrtc_, "pad-added", G_CALLBACK(addDecodeBin), pipe_); -#if GST_CHECK_VERSION(1, 17, 0) +#if GST_CHECK_VERSION(1, 18, 0) // capture ICE gathering completion g_signal_connect( webrtc_, "notify::ice-gathering-state", G_CALLBACK(iceGatheringStateChanged), nullptr);