diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-04-19 16:14:37 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-19 16:14:37 -0500 |
| commit | a9c74fdc0462349bd9ae6f25ae72f071c95d1e76 (patch) | |
| tree | 5fb5aa21a95a0e3a603725dd210a17ffcbad9759 | |
| parent | 4e9643b2a0267c20a68cc7f886ebad12c33c2b0a (diff) | |
| parent | b437656c2ebebe9d473454585e72d9cbab9bf474 (diff) | |
Merge ""confbridge show profile bridge" does not output "sfu" when video_mode is sfu"
| -rw-r--r-- | apps/confbridge/conf_config_parser.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index c143e39e2..873831911 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -1673,8 +1673,10 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e, ast_cli(a->fd,"Registration context: %s\n", b_profile.regcontext); switch (b_profile.flags - & (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED | BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED - | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER)) { + & (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED | + BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED | + BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER | + BRIDGE_OPT_VIDEO_SRC_SFU)) { case BRIDGE_OPT_VIDEO_SRC_LAST_MARKED: ast_cli(a->fd, "Video Mode: last_marked\n"); break; @@ -1684,6 +1686,9 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e, case BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER: ast_cli(a->fd, "Video Mode: follow_talker\n"); break; + case BRIDGE_OPT_VIDEO_SRC_SFU: + ast_cli(a->fd, "Video Mode: sfu\n"); + break; case 0: ast_cli(a->fd, "Video Mode: no video\n"); break; @@ -2030,12 +2035,6 @@ static int video_mode_handler(const struct aco_option *opt, struct ast_variable | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER | BRIDGE_OPT_VIDEO_SRC_SFU, BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER); - } else if (!strcasecmp(var->value, "none")) { - ast_clear_flag(b_profile, - BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED - | BRIDGE_OPT_VIDEO_SRC_LAST_MARKED - | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER - | BRIDGE_OPT_VIDEO_SRC_SFU); } else if (!strcasecmp(var->value, "sfu")) { ast_set_flags_to(b_profile, BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED @@ -2043,6 +2042,12 @@ static int video_mode_handler(const struct aco_option *opt, struct ast_variable | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER | BRIDGE_OPT_VIDEO_SRC_SFU, BRIDGE_OPT_VIDEO_SRC_SFU); + } else if (!strcasecmp(var->value, "none")) { + ast_clear_flag(b_profile, + BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED + | BRIDGE_OPT_VIDEO_SRC_LAST_MARKED + | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER + | BRIDGE_OPT_VIDEO_SRC_SFU); } else { return -1; } |