diff options
| author | Corey Farrell <git@cfware.com> | 2018-01-08 21:25:23 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2018-01-08 21:25:23 -0500 |
| commit | d46cbe788a06bb3e58132b3cbeb282a0f057caf0 (patch) | |
| tree | 9d5a03e368d94779421f3176565ce303bd708c05 /bridges | |
| parent | 8e18209cadf094fc0e1dec4c7375073864b611a9 (diff) | |
bridge_softmix: Fix sfu_append_source_streams test.
* 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
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index 334356943..1ff92ad91 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -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); - 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_stream_get_name(stream)); ao2_cleanup(params_caps); @@ -1975,7 +1975,7 @@ static int validate_original_streams(struct ast_test *test, struct ast_stream_to 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), ¶ms[i])) { return -1; } @@ -1996,10 +1996,10 @@ AST_TEST_DEFINE(sfu_append_source_streams) { "alice_video", "vp8", AST_MEDIA_TYPE_VIDEO, }, }; 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 = { - "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_bob = NULL; |