<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14708">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stasis_bridge.c: Fixed wrong video_mode shown<br><br>Currently, if the bridge has created by the ARI, the video_mode<br>parameter was<br>not shown in the BridgeCreated event correctly.<br><br>Fixed it and added video_mode shown in the 'bridge show <bridge id>'<br>cli.<br><br>ASTERISK-28987<br><br>Change-Id: I8c205126724e34c2bdab9380f523eb62478e4295<br>---<br>M main/bridge.c<br>M res/res_stasis.c<br>M res/stasis/stasis_bridge.c<br>3 files changed, 7 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/bridge.c b/main/bridge.c</span><br><span>index 4798c72..23f682c 100644</span><br><span>--- a/main/bridge.c</span><br><span>+++ b/main/bridge.c</span><br><span>@@ -5126,6 +5126,7 @@</span><br><span> ast_cli(a->fd, "Subclass: %s\n", snapshot->subclass);</span><br><span> ast_cli(a->fd, "Creator: %s\n", snapshot->creator);</span><br><span> ast_cli(a->fd, "Name: %s\n", snapshot->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_cli(a->fd, "Video-Mode: %s\n", ast_bridge_video_mode_to_string(snapshot->video_mode));</span><br><span> ast_cli(a->fd, "Video-Source-Id: %s\n", snapshot->video_source_id);</span><br><span> ast_cli(a->fd, "Num-Channels: %u\n", snapshot->num_channels);</span><br><span> ast_cli(a->fd, "Num-Active: %u\n", snapshot->num_active);</span><br><span>diff --git a/res/res_stasis.c b/res/res_stasis.c</span><br><span>index 8559658..4850f6a 100644</span><br><span>--- a/res/res_stasis.c</span><br><span>+++ b/res/res_stasis.c</span><br><span>@@ -799,12 +799,12 @@</span><br><span> </span><br><span> bridge = bridge_stasis_new(capabilities, flags, name, id);</span><br><span> if (bridge) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_bridge_set_talker_src_video_mode(bridge);</span><br><span> if (!ao2_link(app_bridges, bridge)) {</span><br><span> ast_bridge_destroy(bridge, 0);</span><br><span> bridge = NULL;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return bridge;</span><br><span> }</span><br><span> </span><br><span>diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c</span><br><span>index 701cbae..1b87b48 100644</span><br><span>--- a/res/stasis/stasis_bridge.c</span><br><span>+++ b/res/stasis/stasis_bridge.c</span><br><span>@@ -305,6 +305,11 @@</span><br><span> </span><br><span> bridge = bridge_alloc(sizeof(struct ast_bridge), &bridge_stasis_v_table);</span><br><span> bridge = bridge_base_init(bridge, capabilities, flags, "Stasis", name, id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bridge) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_bridge_set_talker_src_video_mode(bridge);</span><br><span> bridge = bridge_register(bridge);</span><br><span> </span><br><span> return bridge;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14708">change 14708</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/14708"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: I8c205126724e34c2bdab9380f523eb62478e4295 </div>
<div style="display:none"> Gerrit-Change-Number: 14708 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>