mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-19 00:00:09 +00:00
bridging: Add better support for adding/removing streams.
This change adds support to bridge_softmix to allow the addition and removal of additional video source streams. When such a change occurs each participant is renegotiated as needed to reflect the update. If another video source is added then each participant gets another source. If a video source is removed then it is removed from each participant. This functionality allows you to have both your webcam and screenshare providing video if you desire, or even more streams. Mapping has been changed to use the topology index on the source channel as a unique identifier for outgoing participant streams, this will never change and provides an easy way to establish the mapping. The bridge_simple and bridge_native_rtp modules have also been updated to renegotiate when the stream topology of a party changes allowing the same behavior to occur as added to bridge_softmix. If a screen share is added then the opposite party is renegotiated. If that screen share is removed then the opposite party is renegotiated again. Some additional fixes are also included in here. Stream state is now conveyed in SDP so sendonly/recvonly/inactive streams can be requested. Removed streams now also remove previous state from themselves so consumers don't get confused. ASTERISK-28733 Change-Id: I93f41fb41b85646bef71408111c17ccea30cb0c5
This commit is contained in:
Joshua C. Colp
committed by
Joshua Colp
Joshua Colp
parent
a6de4497e6
commit
5a5be92b79
@@ -46,63 +46,8 @@
|
||||
|
||||
static void simple_bridge_stream_topology_changed(struct ast_bridge *bridge,
|
||||
struct ast_bridge_channel *bridge_channel);
|
||||
|
||||
static int simple_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
struct ast_channel *c0 = AST_LIST_FIRST(&bridge->channels)->chan;
|
||||
struct ast_channel *c1 = AST_LIST_LAST(&bridge->channels)->chan;
|
||||
|
||||
/*
|
||||
* If this is the first channel we can't make it compatible...
|
||||
* unless we make it compatible with itself. O.o
|
||||
*/
|
||||
if (c0 == c1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ast_channel_make_compatible(c0, c1)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Align stream topologies */
|
||||
simple_bridge_stream_topology_changed(bridge, NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int simple_bridge_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
|
||||
{
|
||||
const struct ast_control_t38_parameters *t38_parameters;
|
||||
int defer = 0;
|
||||
|
||||
if (!ast_bridge_queue_everyone_else(bridge, bridge_channel, frame)) {
|
||||
/* This frame was successfully queued so no need to defer */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Depending on the frame defer it so when the next channel joins it receives it */
|
||||
switch (frame->frametype) {
|
||||
case AST_FRAME_CONTROL:
|
||||
switch (frame->subclass.integer) {
|
||||
case AST_CONTROL_T38_PARAMETERS:
|
||||
t38_parameters = frame->data.ptr;
|
||||
switch (t38_parameters->request_response) {
|
||||
case AST_T38_REQUEST_NEGOTIATE:
|
||||
defer = -1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return defer;
|
||||
}
|
||||
static int simple_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel);
|
||||
static int simple_bridge_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame);
|
||||
|
||||
static struct ast_bridge_technology simple_bridge = {
|
||||
.name = "simple_bridge",
|
||||
@@ -157,52 +102,145 @@ static struct ast_stream_topology *simple_bridge_request_stream_topology_update(
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < ast_stream_topology_get_count(new_topology); ++i) {
|
||||
stream = ast_stream_topology_get_stream(new_topology, i);
|
||||
|
||||
/* For both recvonly and sendonly the stream state reflects our state, that is we
|
||||
* are receiving only and we are sending only. Since we are renegotiating a remote
|
||||
* party we need to swap this to reflect what we will be doing. That is, if we are
|
||||
* receiving from Alice then we want to be sending to Bob, so swap recvonly to
|
||||
* sendonly.
|
||||
*/
|
||||
if (ast_stream_get_state(stream) == AST_STREAM_STATE_RECVONLY) {
|
||||
ast_stream_set_state(stream, AST_STREAM_STATE_SENDONLY);
|
||||
} else if (ast_stream_get_state(stream) == AST_STREAM_STATE_SENDONLY) {
|
||||
ast_stream_set_state(stream, AST_STREAM_STATE_RECVONLY);
|
||||
}
|
||||
}
|
||||
|
||||
return new_topology;
|
||||
}
|
||||
|
||||
static int simple_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
struct ast_stream_topology *req_top;
|
||||
struct ast_stream_topology *existing_top;
|
||||
struct ast_stream_topology *new_top;
|
||||
struct ast_channel *c0 = AST_LIST_FIRST(&bridge->channels)->chan;
|
||||
struct ast_channel *c1 = AST_LIST_LAST(&bridge->channels)->chan;
|
||||
|
||||
/*
|
||||
* If this is the first channel we can't make it compatible...
|
||||
* unless we make it compatible with itself. O.o
|
||||
*/
|
||||
if (c0 == c1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ast_channel_make_compatible(c0, c1)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* When both channels are joined we want to try to improve the experience by
|
||||
* raising the number of streams so they match.
|
||||
*/
|
||||
ast_channel_lock_both(c0, c1);
|
||||
req_top = ast_channel_get_stream_topology(c0);
|
||||
existing_top = ast_channel_get_stream_topology(c1);
|
||||
if (ast_stream_topology_get_count(req_top) < ast_stream_topology_get_count(existing_top)) {
|
||||
SWAP(req_top, existing_top);
|
||||
SWAP(c0, c1);
|
||||
}
|
||||
new_top = simple_bridge_request_stream_topology_update(existing_top, req_top);
|
||||
ast_channel_unlock(c0);
|
||||
ast_channel_unlock(c1);
|
||||
|
||||
if (!new_top) {
|
||||
/* Failure. We'll just have to live with the current topology. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
ast_channel_request_stream_topology_change(c1, new_top, &simple_bridge);
|
||||
ast_stream_topology_free(new_top);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int simple_bridge_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
|
||||
{
|
||||
const struct ast_control_t38_parameters *t38_parameters;
|
||||
int defer = 0;
|
||||
|
||||
if (!ast_bridge_queue_everyone_else(bridge, bridge_channel, frame)) {
|
||||
/* This frame was successfully queued so no need to defer */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Depending on the frame defer it so when the next channel joins it receives it */
|
||||
switch (frame->frametype) {
|
||||
case AST_FRAME_CONTROL:
|
||||
switch (frame->subclass.integer) {
|
||||
case AST_CONTROL_T38_PARAMETERS:
|
||||
t38_parameters = frame->data.ptr;
|
||||
switch (t38_parameters->request_response) {
|
||||
case AST_T38_REQUEST_NEGOTIATE:
|
||||
defer = -1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return defer;
|
||||
}
|
||||
|
||||
static void simple_bridge_stream_topology_changed(struct ast_bridge *bridge,
|
||||
struct ast_bridge_channel *bridge_channel)
|
||||
{
|
||||
struct ast_channel *req_chan;
|
||||
struct ast_channel *existing_chan;
|
||||
struct ast_channel *c0 = bridge_channel->chan;
|
||||
struct ast_channel *c1 = AST_LIST_FIRST(&bridge->channels)->chan;
|
||||
struct ast_stream_topology *req_top;
|
||||
struct ast_stream_topology *existing_top;
|
||||
struct ast_stream_topology *new_top;
|
||||
|
||||
if (bridge_channel) {
|
||||
ast_bridge_channel_stream_map(bridge_channel);
|
||||
ast_bridge_channel_stream_map(bridge_channel);
|
||||
|
||||
if (ast_channel_get_stream_topology_change_source(bridge_channel->chan)
|
||||
== &simple_bridge) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
req_chan = AST_LIST_FIRST(&bridge->channels)->chan;
|
||||
existing_chan = AST_LIST_LAST(&bridge->channels)->chan;
|
||||
if (req_chan == existing_chan) {
|
||||
/* Wait until both channels are in the bridge to align topologies. */
|
||||
if (ast_channel_get_stream_topology_change_source(bridge_channel->chan)
|
||||
== &simple_bridge) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Align topologies according to size or first channel to join */
|
||||
ast_channel_lock_both(req_chan, existing_chan);
|
||||
req_top = ast_channel_get_stream_topology(req_chan);
|
||||
existing_top = ast_channel_get_stream_topology(existing_chan);
|
||||
if (ast_stream_topology_get_count(req_top) < ast_stream_topology_get_count(existing_top)) {
|
||||
SWAP(req_top, existing_top);
|
||||
SWAP(req_chan, existing_chan);
|
||||
if (c0 == c1) {
|
||||
c1 = AST_LIST_LAST(&bridge->channels)->chan;
|
||||
}
|
||||
|
||||
if (c0 == c1) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* If a party renegotiates we want to renegotiate their counterpart to a matching
|
||||
* topology.
|
||||
*/
|
||||
ast_channel_lock_both(c0, c1);
|
||||
req_top = ast_channel_get_stream_topology(c0);
|
||||
existing_top = ast_channel_get_stream_topology(c1);
|
||||
new_top = simple_bridge_request_stream_topology_update(existing_top, req_top);
|
||||
ast_channel_unlock(req_chan);
|
||||
ast_channel_unlock(existing_chan);
|
||||
ast_channel_unlock(c0);
|
||||
ast_channel_unlock(c1);
|
||||
|
||||
if (!new_top) {
|
||||
/* Failure. We'll just have to live with the current topology. */
|
||||
return;
|
||||
}
|
||||
|
||||
ast_channel_request_stream_topology_change(existing_chan, new_top, &simple_bridge);
|
||||
ast_channel_request_stream_topology_change(c1, new_top, &simple_bridge);
|
||||
ast_stream_topology_free(new_top);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user