kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridging: Add better support for adding/removing streams."

Browse Source
This commit is contained in:
George Joseph
2020-02-20 13:44:10 -06:00
committed by Gerrit Code Review
parent 9f25b4aa44 5a5be92b79
commit 3854b561a5
8 changed files with 566 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/channel.c
View File

@@ -11028,6 +11028,25 @@ int ast_channel_stream_topology_changed(struct ast_channel *chan, struct ast_str
return ast_channel_tech(chan)->indicate(chan, AST_CONTROL_STREAM_TOPOLOGY_CHANGED, topology, sizeof(topology));
}
int ast_channel_stream_topology_changed_externally(struct ast_channel *chan)
{
int res;
struct ast_frame f = { AST_FRAME_CONTROL, .subclass.integer = AST_CONTROL_STREAM_TOPOLOGY_CHANGED };
ast_assert(chan != NULL);
if (!ast_channel_is_multistream(chan)) {
return -1;
}
ast_channel_lock(chan);
ast_channel_internal_set_stream_topology_change_source(chan, (void *)&ast_stream_topology_changed_external);
res = ast_queue_frame(chan, &f);
ast_channel_unlock(chan);
return res;
}
void ast_channel_set_flag(struct ast_channel *chan, unsigned int flag)
{
ast_channel_lock(chan);

22
main/stream.c
View File

@@ -96,8 +96,9 @@ struct ast_stream_topology {
struct ast_stream *ast_stream_alloc(const char *name, enum ast_media_type type)
{
struct ast_stream *stream;
size_t name_len = MAX(strlen(S_OR(name, "")), 7); /* Ensure there is enough room for 'removed' */
stream = ast_calloc(1, sizeof(*stream) + strlen(S_OR(name, "")) + 1);
stream = ast_calloc(1, sizeof(*stream) + name_len + 1);
if (!stream) {
return NULL;
}
@@ -113,16 +114,16 @@ struct ast_stream *ast_stream_alloc(const char *name, enum ast_media_type type)
struct ast_stream *ast_stream_clone(const struct ast_stream *stream, const char *name)
{
struct ast_stream *new_stream;
size_t stream_size;
const char *stream_name;
size_t name_len;
if (!stream) {
return NULL;
}
stream_name = name ?: stream->name;
stream_size = sizeof(*stream) + strlen(stream_name) + 1;
new_stream = ast_calloc(1, stream_size);
name_len = MAX(strlen(stream_name), 7); /* Ensure there is enough room for 'removed' */
new_stream = ast_calloc(1, sizeof(*stream) + name_len + 1);
if (!new_stream) {
return NULL;
}
@@ -205,6 +206,19 @@ void ast_stream_set_state(struct ast_stream *stream, enum ast_stream_state state
ast_assert(stream != NULL);
stream->state = state;
/* When a stream is set to removed that means that any previous data for it
* is no longer valid. We therefore change its name to removed and remove
* any old metadata associated with it.
*/
if (state == AST_STREAM_STATE_REMOVED) {
strcpy(stream->name, "removed");
ast_variables_destroy(stream->metadata);
stream->metadata = NULL;
if (stream->formats) {
ast_format_cap_remove_by_type(stream->formats, AST_MEDIA_TYPE_UNKNOWN);
}
}
}
const char *ast_stream_state2str(enum ast_stream_state state)