kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 22:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge/core_unreal: Fix SFU bugs with forwarding frames.

Browse Source 
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
This commit is contained in:
Joshua Colp
2017-07-11 19:33:44 +00:00
parent 3e7cfe3a92
commit 7f09fd2c2f
5 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/core_unreal.c
View File

@@ -323,6 +323,19 @@ int ast_unreal_write(struct ast_channel *ast, struct ast_frame *f)
return -1;
}
/* If we are told to write a frame with a type that has no corresponding
* stream on the channel then drop it.
*/
if (f->frametype == AST_FRAME_VOICE) {
if (!ast_channel_get_default_stream(ast, AST_MEDIA_TYPE_AUDIO)) {
return 0;
}
} else if (f->frametype == AST_FRAME_VIDEO) {
if (!ast_channel_get_default_stream(ast, AST_MEDIA_TYPE_VIDEO)) {
return 0;
}
}
/* Just queue for delivery to the other side */
ao2_ref(p, 1);
ao2_lock(p);