kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-09 03:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

core / pjsip: Add support for grouping streams together.

Browse Source 
In WebRTC streams (or media tracks in their world) can be grouped
together using the mslabel. This informs the browser that each
should be synchronized with each other.

This change extends the stream API so this information can
be stored with streams. The PJSIP support has been extended
to use the mslabel to determine grouped streams and store
this association on the streams. Finally when creating the
SDP the group information is used to cause each media stream
to use the same mslabel.

ASTERISK-27379

Change-Id: Id6299aa031efe46254edbdc7973c534d54d641ad
This commit is contained in:
Joshua Colp
2017-10-25 22:31:33 +00:00
parent be5b7b2076
commit 4c535f5c30
6 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main/stream.c
View File

@@ -66,6 +66,11 @@ struct ast_stream {
*/
ast_stream_data_free_fn data_free_fn[AST_STREAM_DATA_SLOT_MAX];
/*!
* \brief The group that the stream is part of
*/
int group;
/*!
* \brief Name for the stream within the context of the channel it is on
*/
@@ -90,6 +95,7 @@ struct ast_stream *ast_stream_alloc(const char *name, enum ast_media_type type)
stream->type = type;
stream->state = AST_STREAM_STATE_INACTIVE;
stream->group = -1;
strcpy(stream->name, S_OR(name, "")); /* Safe */
return stream;
@@ -115,6 +121,7 @@ struct ast_stream *ast_stream_clone(const struct ast_stream *stream, const char
memcpy(new_stream, stream, sizeof(*new_stream));
strcpy(new_stream->name, stream_name); /* Safe */
new_stream->group = -1;
if (new_stream->formats) {
ao2_ref(new_stream->formats, +1);
}
@@ -288,14 +295,16 @@ struct ast_stream_topology *ast_stream_topology_clone(
}
for (i = 0; i < AST_VECTOR_SIZE(&topology->streams); i++) {
struct ast_stream *stream =
ast_stream_clone(AST_VECTOR_GET(&topology->streams, i), NULL);
struct ast_stream *existing = AST_VECTOR_GET(&topology->streams, i);
struct ast_stream *stream = ast_stream_clone(existing, NULL);
if (!stream || AST_VECTOR_APPEND(&new_topology->streams, stream)) {
ast_stream_free(stream);
ast_stream_topology_free(new_topology);
return NULL;
}
ast_stream_set_group(stream, ast_stream_get_group(existing));
}
return new_topology;
@@ -580,3 +589,17 @@ void ast_stream_topology_map(const struct ast_stream_topology *topology,
AST_VECTOR_REPLACE(v1, index, i);
}
}
int ast_stream_get_group(const struct ast_stream *stream)
{
ast_assert(stream != NULL);
return stream->group;
}
void ast_stream_set_group(struct ast_stream *stream, int group)
{
ast_assert(stream != NULL);
stream->group = group;
}