diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-06 06:57:24 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-06 06:57:24 -0500 |
| commit | bb2f6234da761194100d30f33d4d839f75ab78f1 (patch) | |
| tree | 0e374db6de7d2347a216b4319311f03eb5ee9eb8 /main/bridge_channel.c | |
| parent | 97abf6d4759627aec3ef65e43413214b192918a5 (diff) | |
| parent | 2da869408ae5556022526bcd0f526d92fdbb5a5f (diff) | |
Merge "Add primitive SFU support to bridge_softmix."
Diffstat (limited to 'main/bridge_channel.c')
| -rw-r--r-- | main/bridge_channel.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/main/bridge_channel.c b/main/bridge_channel.c index c6ea222ee..02783b103 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -989,6 +989,11 @@ int ast_bridge_channel_queue_frame(struct ast_bridge_channel *bridge_channel, st /* Media frames need to be mapped to an appropriate write stream */ dup->stream_num = AST_VECTOR_GET( &bridge_channel->stream_map.to_bridge, fr->stream_num); + if (dup->stream_num == -1) { + ast_bridge_channel_unlock(bridge_channel); + bridge_frame_free(dup); + return 0; + } } else { dup->stream_num = -1; } @@ -2339,7 +2344,9 @@ static void bridge_channel_handle_write(struct ast_bridge_channel *bridge_channe case AST_FRAME_NULL: break; default: - if (fr->stream_num >= (int)AST_VECTOR_SIZE(&bridge_channel->stream_map.to_channel)) { + if (fr->stream_num > 0 && + (fr->stream_num >= (int)AST_VECTOR_SIZE(&bridge_channel->stream_map.to_channel) || + AST_VECTOR_GET(&bridge_channel->stream_map.to_channel, fr->stream_num) == -1)) { /* Nowhere to write to, so drop it */ break; } @@ -2473,11 +2480,11 @@ static void bridge_handle_trip(struct ast_bridge_channel *bridge_channel) * If a stream topology has changed then the bridge_channel's * media mapping needs to be updated. */ - ast_bridge_channel_stream_map(bridge_channel); - if (bridge_channel->bridge->technology->stream_topology_changed) { bridge_channel->bridge->technology->stream_topology_changed( bridge_channel->bridge, bridge_channel); + } else { + ast_bridge_channel_stream_map(bridge_channel); } break; default: |