diff options
author | Matt Jordan <mjordan@digium.com> | 2016-11-08 10:11:41 -0600 |
---|---|---|
committer | Matt Jordan <mjordan@digium.com> | 2016-11-14 17:02:00 -0500 |
commit | d23b4af4779675589c8a3ce39c0f4b80d0432d5c (patch) | |
tree | bbec0798470850b63070cf5a6464c4f5d85de601 /res/ari/ari_model_validators.c | |
parent | a58d3597019f8cc5a503f140671232ae3f8d9119 (diff) |
res/ari/resource_bridges: Add the ability to manipulate the video source
In multi-party bridges, Asterisk currently supports two video modes:
* Follow the talker, in which the speaker with the most energy is shown
to all participants but the speaker, and the speaker sees the
previous video source
* Explicitly set video sources, in which all participants see a locked
video source
Prior to this patch, ARI had no ability to manipulate the video source.
This isn't important for two-party bridges, in which Asterisk merely
relays the video between the participants. However, in a multi-party
bridge, it can be advantageous to allow an external application to
manipulate the video source.
This patch provides two new routes to accomplish this:
(1) setVideoSource: POST /bridges/{bridgeId}/videoSource/{channelId}
Sets a video source to an explicit channel
(2) clearVideoSource: DELETE /bridges/{bridgeId}/videoSource
Removes any explicit video source, and sets the video mode to talk
detection
ASTERISK-26595 #close
Change-Id: I98e455d5bffc08ea5e8d6b84ccaf063c714e6621
Diffstat (limited to 'res/ari/ari_model_validators.c')
-rw-r--r-- | res/ari/ari_model_validators.c | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index 8874b2451..171cb2907 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -1360,6 +1360,24 @@ int ast_ari_validate_bridge(struct ast_json *json) res = 0; } } else + if (strcmp("video_mode", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI Bridge field video_mode failed validation\n"); + res = 0; + } + } else + if (strcmp("video_source_id", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI Bridge field video_source_id failed validation\n"); + res = 0; + } + } else { ast_log(LOG_ERROR, "ARI Bridge has undocumented field %s\n", @@ -2706,6 +2724,103 @@ ari_validator ast_ari_validate_bridge_merged_fn(void) return ast_ari_validate_bridge_merged; } +int ast_ari_validate_bridge_video_source_changed(struct ast_json *json) +{ + int res = 1; + struct ast_json_iter *iter; + int has_type = 0; + int has_application = 0; + int has_bridge = 0; + + for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) { + if (strcmp("asterisk_id", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field asterisk_id failed validation\n"); + res = 0; + } + } else + if (strcmp("type", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_type = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field type failed validation\n"); + res = 0; + } + } else + if (strcmp("application", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_application = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field application failed validation\n"); + res = 0; + } + } else + if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_date( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field timestamp failed validation\n"); + res = 0; + } + } else + if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_bridge = 1; + prop_is_valid = ast_ari_validate_bridge( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field bridge failed validation\n"); + res = 0; + } + } else + if (strcmp("old_video_source_id", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged field old_video_source_id failed validation\n"); + res = 0; + } + } else + { + ast_log(LOG_ERROR, + "ARI BridgeVideoSourceChanged has undocumented field %s\n", + ast_json_object_iter_key(iter)); + res = 0; + } + } + + if (!has_type) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged missing required field type\n"); + res = 0; + } + + if (!has_application) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged missing required field application\n"); + res = 0; + } + + if (!has_bridge) { + ast_log(LOG_ERROR, "ARI BridgeVideoSourceChanged missing required field bridge\n"); + res = 0; + } + + return res; +} + +ari_validator ast_ari_validate_bridge_video_source_changed_fn(void) +{ + return ast_ari_validate_bridge_video_source_changed; +} + int ast_ari_validate_channel_caller_id(struct ast_json *json) { int res = 1; @@ -4912,6 +5027,9 @@ int ast_ari_validate_event(struct ast_json *json) if (strcmp("BridgeMerged", discriminator) == 0) { return ast_ari_validate_bridge_merged(json); } else + if (strcmp("BridgeVideoSourceChanged", discriminator) == 0) { + return ast_ari_validate_bridge_video_source_changed(json); + } else if (strcmp("ChannelCallerId", discriminator) == 0) { return ast_ari_validate_channel_caller_id(json); } else @@ -5104,6 +5222,9 @@ int ast_ari_validate_message(struct ast_json *json) if (strcmp("BridgeMerged", discriminator) == 0) { return ast_ari_validate_bridge_merged(json); } else + if (strcmp("BridgeVideoSourceChanged", discriminator) == 0) { + return ast_ari_validate_bridge_video_source_changed(json); + } else if (strcmp("ChannelCallerId", discriminator) == 0) { return ast_ari_validate_channel_caller_id(json); } else |