<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14905">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_stasis.c: Added video_single option for bridge creation<br><br>Currently, it was not possible to create bridge with video_mode single.<br>This made hard to put the bridge in a vidoe_single mode.<br>So, added video_single option for Bridge creation using the ARI.<br>This allows create a bridge with video_mode single.<br><br>ASTERISK-29055<br><br>Change-Id: I43e720e5c83fc75fafe10fe22808ae7f055da2ae<br>---<br>M main/bridge.c<br>M res/ari/resource_bridges.h<br>M res/res_stasis.c<br>M res/stasis/stasis_bridge.c<br>M res/stasis/stasis_bridge.h<br>M rest-api/api-docs/bridges.json<br>6 files changed, 25 insertions(+), 14 deletions(-)<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 351aaf1..d3a87ef 100644</span><br><span>--- a/main/bridge.c</span><br><span>+++ b/main/bridge.c</span><br><span>@@ -3792,13 +3792,15 @@</span><br><span> ast_bridge_lock(bridge);</span><br><span> cleanup_video_mode(bridge);</span><br><span> bridge->softmix.video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;</span><br><span style="color: hsl(0, 100%, 40%);">- bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- bridge->name, bridge->uniqueid,</span><br><span style="color: hsl(0, 100%, 40%);">- ast_channel_name(video_src_chan),</span><br><span style="color: hsl(0, 100%, 40%);">- ast_channel_uniqueid(video_src_chan));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (video_src_chan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bridge->name, bridge->uniqueid,</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_name(video_src_chan),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_uniqueid(video_src_chan));</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> ast_bridge_publish_state(bridge);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);</span><br><span> ast_bridge_unlock(bridge);</span><br><span> }</span><br><span> </span><br><span>diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h</span><br><span>index 61fc6bb..6dd252f 100644</span><br><span>--- a/res/ari/resource_bridges.h</span><br><span>+++ b/res/ari/resource_bridges.h</span><br><span>@@ -52,7 +52,7 @@</span><br><span> void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response);</span><br><span> /*! Argument struct for ast_ari_bridges_create() */</span><br><span> struct ast_ari_bridges_create_args {</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media). */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_single). */</span><br><span> const char *type;</span><br><span> /*! Unique ID to give to the bridge being created. */</span><br><span> const char *bridge_id;</span><br><span>@@ -82,7 +82,7 @@</span><br><span> void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response);</span><br><span> /*! Argument struct for ast_ari_bridges_create_with_id() */</span><br><span> struct ast_ari_bridges_create_with_id_args {</span><br><span style="color: hsl(0, 100%, 40%);">- /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media) to set. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_single) to set. */</span><br><span> const char *type;</span><br><span> /*! Unique ID to give to the bridge being created. */</span><br><span> const char *bridge_id;</span><br><span>diff --git a/res/res_stasis.c b/res/res_stasis.c</span><br><span>index 4850f6a..4db58fa 100644</span><br><span>--- a/res/res_stasis.c</span><br><span>+++ b/res/res_stasis.c</span><br><span>@@ -775,6 +775,7 @@</span><br><span> int flags = AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_MERGE_INHIBIT_TO</span><br><span> | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO</span><br><span> | AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum ast_bridge_video_mode_type video_mode = AST_BRIDGE_VIDEO_MODE_TALKER_SRC;</span><br><span> </span><br><span> while ((requested_type = strsep(&requested_types, ","))) {</span><br><span> requested_type = ast_strip(requested_type);</span><br><span>@@ -787,6 +788,8 @@</span><br><span> } else if (!strcmp(requested_type, "dtmf_events") ||</span><br><span> !strcmp(requested_type, "proxy_media")) {</span><br><span> capabilities &= ~AST_BRIDGE_CAPABILITY_NATIVE;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(requested_type, "video_single")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ video_mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -797,7 +800,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bridge = bridge_stasis_new(capabilities, flags, name, id);</span><br><span style="color: hsl(120, 100%, 40%);">+ bridge = bridge_stasis_new(capabilities, flags, name, id, video_mode);</span><br><span> if (bridge) {</span><br><span> if (!ao2_link(app_bridges, bridge)) {</span><br><span> ast_bridge_destroy(bridge, 0);</span><br><span>diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c</span><br><span>index 1b87b48..00dd4b9 100644</span><br><span>--- a/res/stasis/stasis_bridge.c</span><br><span>+++ b/res/stasis/stasis_bridge.c</span><br><span>@@ -299,7 +299,7 @@</span><br><span> ast_bridge_base_v_table.pull(self, bridge_channel);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id)</span><br><span style="color: hsl(120, 100%, 40%);">+struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id, enum ast_bridge_video_mode_type video_mode)</span><br><span> {</span><br><span> void *bridge;</span><br><span> </span><br><span>@@ -309,7 +309,12 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_bridge_set_talker_src_video_mode(bridge);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (video_mode == AST_BRIDGE_VIDEO_MODE_SINGLE_SRC) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_bridge_set_single_src_video_mode(bridge, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_bridge_set_talker_src_video_mode(bridge);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bridge = bridge_register(bridge);</span><br><span> </span><br><span> return bridge;</span><br><span>diff --git a/res/stasis/stasis_bridge.h b/res/stasis/stasis_bridge.h</span><br><span>index 2590fd7..6e2a48b 100644</span><br><span>--- a/res/stasis/stasis_bridge.h</span><br><span>+++ b/res/stasis/stasis_bridge.h</span><br><span>@@ -50,11 +50,12 @@</span><br><span> * \param flags Flags that will alter the behavior of the bridge</span><br><span> * \param name Name given to the bridge by Stasis (optional)</span><br><span> * \param id Unique ID given to the bridge by Stasis (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param video_mode Video mode of the bridge</span><br><span> *</span><br><span> * \retval a pointer to a new bridge on success</span><br><span> * \retval NULL on failure</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id);</span><br><span style="color: hsl(120, 100%, 40%);">+struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags, const char *name, const char *id, enum ast_bridge_video_mode_type video_mode);</span><br><span> </span><br><span> /*!</span><br><span> * \internal</span><br><span>diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json</span><br><span>index 78bd3af..6268c49 100644</span><br><span>--- a/rest-api/api-docs/bridges.json</span><br><span>+++ b/rest-api/api-docs/bridges.json</span><br><span>@@ -26,7 +26,7 @@</span><br><span> "parameters": [</span><br><span> {</span><br><span> "name": "type",</span><br><span style="color: hsl(0, 100%, 40%);">- "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media).",</span><br><span style="color: hsl(120, 100%, 40%);">+ "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_single).",</span><br><span> "paramType": "query",</span><br><span> "required": false,</span><br><span> "allowMultiple": false,</span><br><span>@@ -65,7 +65,7 @@</span><br><span> "parameters": [</span><br><span> {</span><br><span> "name": "type",</span><br><span style="color: hsl(0, 100%, 40%);">- "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media) to set.",</span><br><span style="color: hsl(120, 100%, 40%);">+ "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_single) to set.",</span><br><span> "paramType": "query",</span><br><span> "required": false,</span><br><span> "allowMultiple": false,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14905">change 14905</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/+/14905"/><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: I43e720e5c83fc75fafe10fe22808ae7f055da2ae </div>
<div style="display:none"> Gerrit-Change-Number: 14905 </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: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>