Merge ""confbridge show profile bridge" does not output "sfu" when video_mode is sfu"

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;
 	}