[asterisk-commits] bridge: Change participant SFU streams when source streams c... (asterisk[master])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 21 15:56:47 CDT 2017
Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/6531 )
Change subject: bridge: Change participant SFU streams when source streams change.
......................................................................
bridge: Change participant SFU streams when source streams change.
Some endpoints do not like a stream being reused for a new
media stream. The frame/jitterbuffer can rely on underlying
attributes of the media stream in order to order the packets.
When a new stream takes its place without any notice the
buffer can get confused and the media ends up getting dropped.
This change uses the SSRC change to determine that a new source
is reusing an existing stream and then bridge_softmix renegotiates
each participant such that they see a new media stream. This
causes the frame/jitterbuffer to start fresh and work as expected.
ASTERISK-27277
Change-Id: I30ccbdba16ca073d7f31e0e59ab778c153afae07
---
M bridges/bridge_softmix.c
M channels/chan_iax2.c
M channels/chan_pjsip.c
M funcs/func_frame_trace.c
M include/asterisk/frame.h
M include/asterisk/res_pjsip_session.h
M main/channel.c
M res/res_pjsip_sdp_rtp.c
M res/res_pjsip_session.c
9 files changed, 162 insertions(+), 9 deletions(-)
Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Joshua Colp: Approved for Submit
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 59b16b7..5e0a485 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -79,7 +79,7 @@
struct softmix_translate_helper_entry {
int num_times_requested; /*!< Once this entry is no longer requested, free the trans_pvt
- and re-init if it was usable. */
+ and re-init if it was usable. */
struct ast_format *dst_format; /*!< The destination format for this helper */
struct ast_trans_pvt *trans_pvt; /*!< the translator for this slot. */
struct ast_frame *out_frame; /*!< The output frame from the last translation */
@@ -493,21 +493,21 @@
for (i = 0; i < ast_stream_topology_get_count(source); ++i) {
struct ast_stream *stream;
struct ast_stream *stream_clone;
- char *stream_clone_name;
- size_t stream_clone_name_len;
+ char *stream_clone_name = NULL;
stream = ast_stream_topology_get_stream(source, i);
if (!is_video_source(stream)) {
continue;
}
- /* The +3 is for the two underscore separators and null terminator */
- stream_clone_name_len = SOFTBRIDGE_VIDEO_DEST_LEN + strlen(channel_name) + strlen(ast_stream_get_name(stream)) + 3;
- stream_clone_name = ast_alloca(stream_clone_name_len);
- snprintf(stream_clone_name, stream_clone_name_len, "%s_%s_%s", SOFTBRIDGE_VIDEO_DEST_PREFIX,
- channel_name, ast_stream_get_name(stream));
+ if (ast_asprintf(&stream_clone_name, "%s_%s_%s", SOFTBRIDGE_VIDEO_DEST_PREFIX,
+ channel_name, ast_stream_get_name(stream)) < 0) {
+ ast_free(stream_clone_name);
+ return -1;
+ }
stream_clone = ast_stream_clone(stream, stream_clone_name);
+ ast_free(stream_clone_name);
if (!stream_clone) {
return -1;
}
@@ -987,6 +987,120 @@
}
}
+static int remove_all_original_streams(struct ast_stream_topology *dest,
+ const struct ast_stream_topology *source,
+ const struct ast_stream_topology *original)
+{
+ int i;
+
+ for (i = 0; i < ast_stream_topology_get_count(source); ++i) {
+ struct ast_stream *stream;
+ int original_index;
+
+ stream = ast_stream_topology_get_stream(source, i);
+
+ /* Mark the existing stream as removed so we get a new one, this will get
+ * reused on a subsequent renegotiation.
+ */
+ for (original_index = 0; original_index < ast_stream_topology_get_count(original); ++original_index) {
+ struct ast_stream *original_stream = ast_stream_topology_get_stream(original, original_index);
+
+ if (!strcmp(ast_stream_get_name(stream), ast_stream_get_name(original_stream))) {
+ struct ast_stream *removed;
+
+ /* Since the participant is still going to be in the bridge we
+ * change the name so that routing does not attempt to route video
+ * to this stream.
+ */
+ removed = ast_stream_clone(stream, "removed");
+ if (!removed) {
+ return -1;
+ }
+
+ ast_stream_set_state(removed, AST_STREAM_STATE_REMOVED);
+
+ /* The destination topology can only ever contain the same, or more,
+ * streams than the original so this is safe.
+ */
+ if (ast_stream_topology_set_stream(dest, original_index, removed)) {
+ ast_stream_free(removed);
+ return -1;
+ }
+
+ break;
+ }
+ }
+ }
+
+ return 0;
+}
+
+static void sfu_topologies_on_source_change(struct ast_bridge_channel *source, struct ast_bridge_channels_list *participants)
+{
+ struct ast_stream_topology *source_video = NULL;
+ struct ast_bridge_channel *participant;
+ int res;
+
+ source_video = ast_stream_topology_alloc();
+ if (!source_video) {
+ return;
+ }
+
+ ast_channel_lock(source->chan);
+ res = append_source_streams(source_video, ast_channel_name(source->chan), ast_channel_get_stream_topology(source->chan));
+ ast_channel_unlock(source->chan);
+ if (res) {
+ goto cleanup;
+ }
+
+ AST_LIST_TRAVERSE(participants, participant, entry) {
+ struct ast_stream_topology *original_topology;
+ struct ast_stream_topology *participant_topology;
+
+ if (participant == source) {
+ continue;
+ }
+
+ ast_channel_lock(participant->chan);
+ original_topology = ast_stream_topology_clone(ast_channel_get_stream_topology(participant->chan));
+ ast_channel_unlock(participant->chan);
+ if (!original_topology) {
+ goto cleanup;
+ }
+
+ participant_topology = ast_stream_topology_clone(original_topology);
+ if (!participant_topology) {
+ ast_stream_topology_free(original_topology);
+ goto cleanup;
+ }
+
+ /* We add all the source streams back in, if any removed streams are already present they will
+ * get used first followed by appending new ones.
+ */
+ if (append_all_streams(participant_topology, source_video)) {
+ ast_stream_topology_free(participant_topology);
+ ast_stream_topology_free(original_topology);
+ goto cleanup;
+ }
+
+ /* And the original existing streams get marked as removed. This causes the remote side to see
+ * a new stream for the source streams.
+ */
+ if (remove_all_original_streams(participant_topology, source_video, original_topology)) {
+ ast_stream_topology_free(participant_topology);
+ ast_stream_topology_free(original_topology);
+ goto cleanup;
+ }
+
+ ast_channel_request_stream_topology_change(participant->chan, participant_topology, NULL);
+ ast_stream_topology_free(participant_topology);
+ ast_stream_topology_free(original_topology);
+ }
+
+cleanup:
+ ast_stream_topology_free(source_video);
+}
+
/*!
* \internal
* \brief Determine what to do with a control frame.
@@ -1016,6 +1130,11 @@
softmix_data->last_video_update = ast_tvnow();
}
break;
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
+ if (bridge->softmix.video_mode.mode == AST_BRIDGE_VIDEO_MODE_SFU) {
+ sfu_topologies_on_source_change(bridge_channel, &bridge->channels);
+ }
+ break;
default:
break;
}
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 490c4ce..04aa228 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1433,6 +1433,7 @@
/* Intended only for internal stream topology manipulation. */
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
/* Intended only for internal stream topology change notification. */
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
case AST_CONTROL_STREAM_STOP:
case AST_CONTROL_STREAM_SUSPEND:
case AST_CONTROL_STREAM_RESTART:
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 84b508b..7520c2b 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -1740,6 +1740,8 @@
break;
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
break;
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
+ break;
case -1:
res = -1;
break;
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 49abfdf..e88cafa 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -342,6 +342,9 @@
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
ast_verbose("SubClass: STREAM_TOPOLOGY_CHANGED\n");
break;
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
+ ast_verbose("SubClass: STREAM_TOPOLOGY_SOURCE_CHANGED\n");
+ break;
case AST_CONTROL_STREAM_STOP:
ast_verbose("SubClass: STREAM_STOP\n");
break;
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 8f0dacc..eb6a647 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -301,6 +301,7 @@
AST_CONTROL_MASQUERADE_NOTIFY = 34, /*!< A masquerade is about to begin/end. (Never sent as a frame but directly with ast_indicate_data().) */
AST_CONTROL_STREAM_TOPOLOGY_REQUEST_CHANGE = 35, /*!< Channel indication that a stream topology change has been requested */
AST_CONTROL_STREAM_TOPOLOGY_CHANGED = 36, /*!< Channel indication that a stream topology change has occurred */
+ AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED = 37, /*!< Channel indication that one of the source streams has changed its source */
/*
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h
index d5b6fa1..fcb14b7 100644
--- a/include/asterisk/res_pjsip_session.h
+++ b/include/asterisk/res_pjsip_session.h
@@ -109,6 +109,8 @@
char mslabel[AST_UUID_STR_LEN];
/*! \brief Track label */
char label[AST_UUID_STR_LEN];
+ /*! \brief The underlying session has been changed in some fashion */
+ unsigned int changed;
};
/*!
diff --git a/main/channel.c b/main/channel.c
index 74de9ca..ecc771c 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4228,6 +4228,7 @@
case AST_CONTROL_MASQUERADE_NOTIFY:
case AST_CONTROL_STREAM_TOPOLOGY_REQUEST_CHANGE:
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
case AST_CONTROL_STREAM_STOP:
case AST_CONTROL_STREAM_SUSPEND:
case AST_CONTROL_STREAM_REVERSE:
@@ -4528,6 +4529,7 @@
case AST_CONTROL_UPDATE_RTP_PEER:
case AST_CONTROL_STREAM_TOPOLOGY_REQUEST_CHANGE:
case AST_CONTROL_STREAM_TOPOLOGY_CHANGED:
+ case AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED:
case AST_CONTROL_STREAM_STOP:
case AST_CONTROL_STREAM_SUSPEND:
case AST_CONTROL_STREAM_REVERSE:
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index e095f06..88b94ee 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -1022,6 +1022,19 @@
continue;
}
+ /* If we are currently negotiating as a result of the remote side renegotiating then
+ * determine if the source for this stream has changed.
+ */
+ if (pjmedia_sdp_neg_get_state(session->inv_session->neg) == PJMEDIA_SDP_NEG_STATE_REMOTE_OFFER &&
+ session->active_media_state) {
+ struct ast_rtp_instance_stats stats = { 0, };
+
+ if (!ast_rtp_instance_get_stats(session_media->rtp, &stats, AST_RTP_INSTANCE_STAT_REMOTE_SSRC) &&
+ stats.remote_ssrc != ssrc) {
+ session_media->changed = 1;
+ }
+ }
+
ast_rtp_instance_set_remote_ssrc(session_media->rtp, ssrc);
}
}
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 64416a0..4b3bdb8 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -765,6 +765,7 @@
{
int i;
struct ast_stream_topology *topology;
+ unsigned int changed = 0;
for (i = 0; i < local->media_count; ++i) {
struct ast_sip_session_media *session_media;
@@ -802,6 +803,9 @@
if (handle_negotiated_sdp_session_media(session_media, session, local, remote, i, stream)) {
return -1;
}
+
+ changed |= session_media->changed;
+ session_media->changed = 0;
}
/* Apply the pending media state to the channel and make it active */
@@ -858,7 +862,13 @@
ast_channel_unlock(session->channel);
- ast_queue_frame(session->channel, &ast_null_frame);
+ if (changed) {
+ struct ast_frame f = { AST_FRAME_CONTROL, .subclass.integer = AST_CONTROL_STREAM_TOPOLOGY_SOURCE_CHANGED };
+
+ ast_queue_frame(session->channel, &f);
+ } else {
+ ast_queue_frame(session->channel, &ast_null_frame);
+ }
return 0;
}
--
To view, visit https://gerrit.asterisk.org/6531
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I30ccbdba16ca073d7f31e0e59ab778c153afae07
Gerrit-Change-Number: 6531
Gerrit-PatchSet: 4
Gerrit-Owner: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-commits/attachments/20170921/e194baeb/attachment-0001.html>
More information about the asterisk-commits
mailing list