diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-07-11 19:33:44 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2017-07-11 23:47:32 +0000 |
| commit | 7f09fd2c2f1501aeccc7737be4dd0e52fd656913 (patch) | |
| tree | 091d76751a376c690a88ea915b79a0787f5200fb /bridges | |
| parent | 3e7cfe3a92e87dd5c402f4476cee934e44236cc6 (diff) | |
bridge/core_unreal: Fix SFU bugs with forwarding frames.
This change fixes a few things uncovered during SFU testing.
1. Unreal channels incorrectly forwarded video frames when
no video stream was present on them. This caused a crash when
they were read as the core requires a stream to exist for the
underlying media type. The Unreal channel will now ensure a
stream exists for the media type before forwarding the frame
and if no stream exists then the frame is dropped.
2. Mapping of frames during bridging from the stream number of
the underlying channel to the stream number of the bridge was
done in the wrong location. This resulted in the frame getting
dropped. This mapping now occurs on reading of the frame from
the channel.
3. Bridging was using the wrong ast_read function resulting in
it living in a non-multistream world.
4. In bridge_softmix when adding new streams to existing channels
the wrong stream topology was copied resulting in no streams
being added.
Change-Id: Ib7445722c3219951d6740802a0feddf2908c18c8
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index ae877eb6e..21f5190e5 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -600,7 +600,7 @@ static void sfu_topologies_on_join(struct ast_bridge_channel *joiner, struct ast if (participant == joiner) { continue; } - participant_topology = ast_stream_topology_clone(ast_channel_get_stream_topology(joiner->chan)); + participant_topology = ast_stream_topology_clone(ast_channel_get_stream_topology(participant->chan)); if (!participant_topology) { goto cleanup; } |