res_stasis.c: Added video_single option for bridge creation

Currently, it was not possible to create bridge with video_mode single.
This made hard to put the bridge in a vidoe_single mode.
So, added video_single option for Bridge creation using the ARI.
This allows create a bridge with video_mode single.

ASTERISK-29055

Change-Id: I43e720e5c83fc75fafe10fe22808ae7f055da2ae

diff --git a/main/bridge.c b/main/bridge.c
index ea15d1b7a3010e64339b47e55bb4803af0a0f5da..d44f6596e250322f12408a948992891d73754605 100644 (file)
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -3818,13 +3818,15 @@ void ast_bridge_set_single_src_video_mode(struct ast_bridge *bridge, struct ast_
        ast_bridge_lock(bridge);
        cleanup_video_mode(bridge);
        bridge->softmix.video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;
-       bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);
-       ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",
-               bridge->name, bridge->uniqueid,
-               ast_channel_name(video_src_chan),
-               ast_channel_uniqueid(video_src_chan));
+       if (video_src_chan) {
+               bridge->softmix.video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);
+               ast_verb(5, "Video source in bridge '%s' (%s) is now '%s' (%s)\n",
+                       bridge->name, bridge->uniqueid,
+                       ast_channel_name(video_src_chan),
+                       ast_channel_uniqueid(video_src_chan));
+               ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
+       }
        ast_bridge_publish_state(bridge);
-       ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
        ast_bridge_unlock(bridge);
 }
 

diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h
index 83a353227cf3d2f3404c1981ad01747a535f5a2f..95f43d0b398cb3c5553e481a50d44cce6e135a29 100644 (file)
--- a/res/ari/resource_bridges.h
+++ b/res/ari/resource_bridges.h
@@ -52,7 +52,7 @@ struct ast_ari_bridges_list_args {
 void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response);
 /*! Argument struct for ast_ari_bridges_create() */
 struct ast_ari_bridges_create_args {
-       /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu). */
+       /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu, video_single). */
        const char *type;
        /*! Unique ID to give to the bridge being created. */
        const char *bridge_id;
@@ -82,7 +82,7 @@ int ast_ari_bridges_create_parse_body(
 void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response);
 /*! Argument struct for ast_ari_bridges_create_with_id() */
 struct ast_ari_bridges_create_with_id_args {
-       /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu) to set. */
+       /*! Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu, video_single) to set. */
        const char *type;
        /*! Unique ID to give to the bridge being created. */
        const char *bridge_id;

diff --git a/res/res_stasis.c b/res/res_stasis.c
index f975386a186b2dd171ec40e5702404bcdff0ace6..7d05e8b2ebcdb85b0dead36c738db66cf4428da8 100644 (file)
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -792,6 +792,8 @@ static struct ast_bridge *bridge_create_common(const char *type, const char *nam
                        capabilities &= ~AST_BRIDGE_CAPABILITY_NATIVE;
                } else if (!strcmp(requested_type, "video_sfu")) {
                        video_mode = AST_BRIDGE_VIDEO_MODE_SFU;
+               } else if (!strcmp(requested_type, "video_single")) {
+                       video_mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;
                }
        }
 

diff --git a/res/stasis/stasis_bridge.c b/res/stasis/stasis_bridge.c
index d5f70a0ad63150fee9e9f3be6eba5511808776a8..fdfd8fb92b244ebb4d2410de8cec6937f3b5510f 100644 (file)
--- a/res/stasis/stasis_bridge.c
+++ b/res/stasis/stasis_bridge.c
@@ -313,6 +313,8 @@ struct ast_bridge *bridge_stasis_new(uint32_t capabilities, unsigned int flags,
                 * this should rarely be changed but should become configurable in the future.
                 */
                ast_bridge_set_video_update_discard(bridge, 5);
+       } else if (video_mode == AST_BRIDGE_VIDEO_MODE_SINGLE_SRC) {
+               ast_bridge_set_single_src_video_mode(bridge, NULL);
        } else {
                ast_bridge_set_talker_src_video_mode(bridge);
        }

diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json
index a46513791fa8c9e9356725362179389c89c8b9b4..bf0a0016ec8acf923337bdd570a9eddcab3fa11e 100644 (file)
--- a/rest-api/api-docs/bridges.json
+++ b/rest-api/api-docs/bridges.json
@@ -30,7 +30,7 @@
                                        "parameters": [
                                                {
                                                        "name": "type",
-                                                       "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu).",
+                                                       "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu, video_single).",
                                                        "paramType": "query",
                                                        "required": false,
                                                        "allowMultiple": false,
@@ -69,7 +69,7 @@
                                        "parameters": [
                                                {
                                                        "name": "type",
-                                                       "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu) to set.",
+                                                       "description": "Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media, video_sfu, video_single) to set.",
                                                        "paramType": "query",
                                                        "required": false,
                                                        "allowMultiple": false,
@@ -755,7 +755,7 @@
                                },
                                "video_mode": {
                                        "type": "string",
-                                       "description": "The video mode the bridge is using. One of 'none', 'talker', or 'single'.",
+                                       "description": "The video mode the bridge is using. One of 'none', 'talker', 'sfu', or 'single'.",
                                        "required": false
                                },
                                "video_source_id": {