[Asterisk-code-review] bridge softmix: Fix sfu append source streams test. (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/7876 )

Change subject: bridge_softmix: Fix sfu_append_source_streams test.
......................................................................

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
---
M bridges/bridge_softmix.c
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  George Joseph: Looks good to me, approved



diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 3343569..1ff92ad 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -1953,7 +1953,7 @@
 	}
 	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 @@
 		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])) {
 			return -1;
 		}
@@ -1996,10 +1996,10 @@
 		{ "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;

-- 
To view, visit https://gerrit.asterisk.org/7876
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b1dd8bed10439d3c7406f033eb1896b6c419147
Gerrit-Change-Number: 7876
Gerrit-PatchSet: 2
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180110/7f239c8c/attachment.html>