<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8814">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Matthew Fredrickson: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Richard Mudgett: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">"confbridge show profile bridge" does not output "sfu" when video_mode is sfu<br><br>Fixes a bug on the "confbridge show profile bridge" cli command<br>that showed "video_mode=no video" when video_mode was set<br>to "sfu"<br><br>ASTERISK-27418  #close<br><br>Change-Id: I481e3172c7f872664c7ac7809879d541c9f031e9<br>---<br>M apps/confbridge/conf_config_parser.c<br>1 file changed, 13 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c<br>index c143e39..8738319 100644<br>--- a/apps/confbridge/conf_config_parser.c<br>+++ b/apps/confbridge/conf_config_parser.c<br>@@ -1673,8 +1673,10 @@<br>       ast_cli(a->fd,"Registration context: %s\n", b_profile.regcontext);<br> <br>    switch (b_profile.flags<br>-              & (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED | BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED<br>-                  | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER)) {<br>+             & (BRIDGE_OPT_VIDEO_SRC_LAST_MARKED |<br>+                    BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED |<br>+                  BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER |<br>+                 BRIDGE_OPT_VIDEO_SRC_SFU)) {<br>  case BRIDGE_OPT_VIDEO_SRC_LAST_MARKED:<br>                ast_cli(a->fd, "Video Mode:           last_marked\n");<br>           break;<br>@@ -1683,6 +1685,9 @@<br>                 break;<br>        case BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER:<br>              ast_cli(a->fd, "Video Mode:           follow_talker\n");<br>+                break;<br>+       case BRIDGE_OPT_VIDEO_SRC_SFU:<br>+               ast_cli(a->fd, "Video Mode:           sfu\n");<br>           break;<br>        case 0:<br>               ast_cli(a->fd, "Video Mode:           no video\n");<br>@@ -2030,12 +2035,6 @@<br>                              | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER<br>                          | BRIDGE_OPT_VIDEO_SRC_SFU,<br>                   BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER);<br>- } else if (!strcasecmp(var->value, "none")) {<br>-           ast_clear_flag(b_profile,<br>-                    BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED<br>-                            | BRIDGE_OPT_VIDEO_SRC_LAST_MARKED<br>-                           | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER<br>-                         | BRIDGE_OPT_VIDEO_SRC_SFU);<br>  } else if (!strcasecmp(var->value, "sfu")) {<br>             ast_set_flags_to(b_profile,<br>                   BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED<br>@@ -2043,6 +2042,12 @@<br>                             | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER<br>                          | BRIDGE_OPT_VIDEO_SRC_SFU,<br>                   BRIDGE_OPT_VIDEO_SRC_SFU);<br>+   } else if (!strcasecmp(var->value, "none")) {<br>+           ast_clear_flag(b_profile,<br>+                    BRIDGE_OPT_VIDEO_SRC_FIRST_MARKED<br>+                            | BRIDGE_OPT_VIDEO_SRC_LAST_MARKED<br>+                           | BRIDGE_OPT_VIDEO_SRC_FOLLOW_TALKER<br>+                         | BRIDGE_OPT_VIDEO_SRC_SFU);<br>  } else {<br>              return -1;<br>    }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8814">change 8814</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8814"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I481e3172c7f872664c7ac7809879d541c9f031e9 </div>
<div style="display:none"> Gerrit-Change-Number: 8814 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Chris Savinovich <csavinovich@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Matthew Fredrickson <creslin@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>