kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_softmix: Fix sfu_append_source_streams test.

Browse Source 
* validate_stream: zero result from ast_format_cap_identical indicates
  they are not identical, rather than non-zero indicating an error.
* validate_original_streams: use num_streams instead of
  ARRAY_LEN(params).
* Fix declaration of alice_dest_stream and bob_dest_stream.

Change-Id: I6b1dd8bed10439d3c7406f033eb1896b6c419147
This commit is contained in:
Corey Farrell
2018-01-08 21:25:23 -05:00
parent 8e18209cad
commit d46cbe788a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/bridge_softmix.c
View File

@@ -1953,7 +1953,7 @@ static int validate_stream(struct ast_test *test, struct ast_stream *stream,
} }
ast_format_cap_update_by_allow_disallow(params_caps, params->formats, 1); ast_format_cap_update_by_allow_disallow(params_caps, params->formats, 1);
if (ast_format_cap_identical(stream_caps, params_caps)) { if (!ast_format_cap_identical(stream_caps, params_caps)) {
ast_test_status_update(test, "Formats are not as expected on stream '%s'\n", ast_test_status_update(test, "Formats are not as expected on stream '%s'\n",
ast_stream_get_name(stream)); ast_stream_get_name(stream));
ao2_cleanup(params_caps); ao2_cleanup(params_caps);
@@ -1975,7 +1975,7 @@ static int validate_original_streams(struct ast_test *test, struct ast_stream_to
return -1; return -1;
} }
for (i = 0; i < ARRAY_LEN(params); ++i) { for (i = 0; i < num_streams; ++i) {
if (validate_stream(test, ast_stream_topology_get_stream(topology, i), &params[i])) { if (validate_stream(test, ast_stream_topology_get_stream(topology, i), &params[i])) {
return -1; return -1;
} }
@@ -1996,10 +1996,10 @@ AST_TEST_DEFINE(sfu_append_source_streams)
{ "alice_video", "vp8", AST_MEDIA_TYPE_VIDEO, }, { "alice_video", "vp8", AST_MEDIA_TYPE_VIDEO, },
}; };
static const struct stream_parameters alice_dest_stream = { static const struct stream_parameters alice_dest_stream = {
"softbridge_dest_PJSIP/Bob-00000001_bob_video", "vp8", AST_MEDIA_TYPE_VIDEO, "softbridge_dest_PJSIP/Bob-00000001_bob_video", "h264,vp8", AST_MEDIA_TYPE_VIDEO,
}; };
static const struct stream_parameters bob_dest_stream = { static const struct stream_parameters bob_dest_stream = {
"softbridge_dest_PJSIP/Alice-00000000_alice_video", "h264,vp8", AST_MEDIA_TYPE_VIDEO, "softbridge_dest_PJSIP/Alice-00000000_alice_video", "vp8", AST_MEDIA_TYPE_VIDEO,
}; };
struct ast_stream_topology *topology_alice = NULL; struct ast_stream_topology *topology_alice = NULL;
struct ast_stream_topology *topology_bob = NULL; struct ast_stream_topology *topology_bob = NULL;