diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-11-16 16:48:03 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-16 16:48:03 -0600 |
| commit | fdea7fe9e4730dd899038f94bf224363725d342b (patch) | |
| tree | 740b10989aa92f6e3751bfdd5fa7caf557b3d86a /rest-api | |
| parent | 42254406addfe90ebba4558372171811d30f246e (diff) | |
| parent | 62cbcb2e5423cae87e0f84d5e229531b088933b5 (diff) | |
Merge "res/ari/resource_bridges: Add the ability to manipulate the video source" into 14
Diffstat (limited to 'rest-api')
| -rw-r--r-- | rest-api/api-docs/bridges.json | 82 | ||||
| -rw-r--r-- | rest-api/api-docs/events.json | 15 |
2 files changed, 97 insertions, 0 deletions
diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json index ab2c6c2d5..8289b43e1 100644 --- a/rest-api/api-docs/bridges.json +++ b/rest-api/api-docs/bridges.json @@ -241,6 +241,78 @@ ] }, { + "path": "/bridges/{bridgeId}/videoSource/{channelId}", + "description": "Set a channel as the video source in a multi-party bridge", + "operations": [ + { + "httpMethod": "POST", + "summary": "Set a channel as the video source in a multi-party mixing bridge. This operation has no effect on bridges with two or fewer participants.", + "nickname": "setVideoSource", + "responseClass": "void", + "parameters": [ + { + "name": "bridgeId", + "description": "Bridge's id", + "paramType": "path", + "required": true, + "allowMultiple": false, + "dataType": "string" + }, + { + "name": "channelId", + "description": "Channel's id", + "paramType": "path", + "required": true, + "allowMultiple": false, + "dataType": "string" + } + ], + "errorResponses": [ + { + "code": 404, + "reason": "Bridge or Channel not found" + }, + { + "code": 409, + "reason": "Channel not in Stasis application" + }, + { + "code": 422, + "reason": "Channel not in this Bridge" + } + ] + } + ] + }, + { + "path": "/bridges/{bridgeId}/videoSource", + "description": "Removes any explicit video source", + "operations": [ + { + "httpMethod": "DELETE", + "summary": "Removes any explicit video source in a multi-party mixing bridge. This operation has no effect on bridges with two or fewer participants. When no explicit video source is set, talk detection will be used to determine the active video stream.", + "nickname": "clearVideoSource", + "responseClass": "void", + "parameters": [ + { + "name": "bridgeId", + "description": "Bridge's id", + "paramType": "path", + "required": true, + "allowMultiple": false, + "dataType": "string" + } + ], + "errorResponses": [ + { + "code": 404, + "reason": "Bridge not found" + } + ] + } + ] + }, + { "path": "/bridges/{bridgeId}/moh", "description": "Play music on hold to a bridge", "operations": [ @@ -649,6 +721,16 @@ "type": "List[string]", "description": "Ids of channels participating in this bridge", "required": true + }, + "video_mode": { + "type": "string", + "description": "The video mode the bridge is using. One of 'none', 'talker', or 'single'.", + "required": false + }, + "video_source_id": { + "type": "string", + "description": "The ID of the channel that is the source of video in this bridge, if one exists.", + "required": false } } } diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json index 4ef1d21a4..f99f52e67 100644 --- a/rest-api/api-docs/events.json +++ b/rest-api/api-docs/events.json @@ -162,6 +162,7 @@ "BridgeMerged", "BridgeBlindTransfer", "BridgeAttendedTransfer", + "BridgeVideoSourceChanged", "ChannelCreated", "ChannelDestroyed", "ChannelEnteredBridge", @@ -370,6 +371,20 @@ } } }, + "BridgeVideoSourceChanged": { + "id": "BridgeVideoSourceChanged", + "description": "Notification that the source of video in a bridge has changed.", + "properties": { + "bridge": { + "required": true, + "type": "Bridge" + }, + "old_video_source_id": { + "required": false, + "type": "string" + } + } + }, "BridgeBlindTransfer": { "id": "BridgeBlindTransfer", "description": "Notification that a blind transfer has occurred.", |