kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-20 19:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream: Ignore declined streams for some topology calls.

Browse Source 
* Made ast_format_cap_from_stream_topology() not include any formats from
declined streams.

* Made ast_stream_topology_get_first_stream_by_type() ignore declined
streams to return the first active stream of the type.

* Updated unit tests to check these changes have the expected effect.

Change-Id: Iabbc6a3e8edf263a25fd3056c3c614407c7897df
This commit is contained in:
Richard Mudgett
2017-06-14 13:07:17 -05:00
parent 06265b8c8a
commit 4797a8bb81
3 changed files with 90 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/stream.c
View File

@@ -437,9 +437,11 @@ struct ast_format_cap *ast_format_cap_from_stream_topology(
}
for (i = 0; i < AST_VECTOR_SIZE(&topology->streams); i++) {
struct ast_stream *stream = AST_VECTOR_GET(&topology->streams, i);
struct ast_stream *stream;
if (!stream->formats) {
stream = AST_VECTOR_GET(&topology->streams, i);
if (!stream->formats
|| stream->state == AST_STREAM_STATE_REMOVED) {
continue;
}
@@ -458,9 +460,11 @@ struct ast_stream *ast_stream_topology_get_first_stream_by_type(
ast_assert(topology != NULL);
for (i = 0; i < AST_VECTOR_SIZE(&topology->streams); i++) {
struct ast_stream *stream = AST_VECTOR_GET(&topology->streams, i);
struct ast_stream *stream;
if (stream->type == type) {
stream = AST_VECTOR_GET(&topology->streams, i);
if (stream->type == type
&& stream->state != AST_STREAM_STATE_REMOVED) {
return stream;
}
}