summaryrefslogtreecommitdiff
path: root/main/bridge.c
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2018-04-18 15:37:45 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-04-18 15:37:45 -0500
commitaf39255052b9a0adfbb06eb2a169aa8ea4f532ee (patch)
treea354c8ef2f3f678d6cfe7e86c93e294553ebf8be /main/bridge.c
parent0bea1da3ef5f49e027c365f76b90b9c0c2401034 (diff)
parent8de3fa2b56cc954836a13e7d77079754d26fb990 (diff)
Merge "bridge_softmix / app_confbridge: Add support for REMB combining."
Diffstat (limited to 'main/bridge.c')
-rw-r--r--main/bridge.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/main/bridge.c b/main/bridge.c
index 8795081e2..2b347fd3f 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -3852,8 +3852,19 @@ void ast_bridge_set_video_update_discard(struct ast_bridge *bridge, unsigned int
void ast_bridge_set_remb_send_interval(struct ast_bridge *bridge, unsigned int remb_send_interval)
{
+ ast_assert(bridge->softmix.video_mode.mode == AST_BRIDGE_VIDEO_MODE_SFU);
+
+ ast_bridge_lock(bridge);
+ bridge->softmix.video_mode.mode_data.sfu_data.remb_send_interval = remb_send_interval;
+ ast_bridge_unlock(bridge);
+}
+
+void ast_brige_set_remb_behavior(struct ast_bridge *bridge, enum ast_bridge_video_sfu_remb_behavior behavior)
+{
+ ast_assert(bridge->softmix.video_mode.mode == AST_BRIDGE_VIDEO_MODE_SFU);
+
ast_bridge_lock(bridge);
- bridge->softmix.video_mode.remb_send_interval = remb_send_interval;
+ bridge->softmix.video_mode.mode_data.sfu_data.remb_behavior = behavior;
ast_bridge_unlock(bridge);
}