<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7876">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix: Fix sfu_append_source_streams test.<br><br>* validate_stream: zero result from ast_format_cap_identical indicates<br> they are not identical, rather than non-zero indicating an error.<br>* validate_original_streams: use num_streams instead of<br> ARRAY_LEN(params).<br>* Fix declaration of alice_dest_stream and bob_dest_stream.<br><br>Change-Id: I6b1dd8bed10439d3c7406f033eb1896b6c419147<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c<br>index 3343569..1ff92ad 100644<br>--- a/bridges/bridge_softmix.c<br>+++ b/bridges/bridge_softmix.c<br>@@ -1953,7 +1953,7 @@<br> }<br> ast_format_cap_update_by_allow_disallow(params_caps, params->formats, 1);<br> <br>- if (ast_format_cap_identical(stream_caps, params_caps)) {<br>+ if (!ast_format_cap_identical(stream_caps, params_caps)) {<br> ast_test_status_update(test, "Formats are not as expected on stream '%s'\n",<br> ast_stream_get_name(stream));<br> ao2_cleanup(params_caps);<br>@@ -1975,7 +1975,7 @@<br> return -1;<br> }<br> <br>- for (i = 0; i < ARRAY_LEN(params); ++i) {<br>+ for (i = 0; i < num_streams; ++i) {<br> if (validate_stream(test, ast_stream_topology_get_stream(topology, i), ¶ms[i])) {<br> return -1;<br> }<br>@@ -1996,10 +1996,10 @@<br> { "alice_video", "vp8", AST_MEDIA_TYPE_VIDEO, },<br> };<br> static const struct stream_parameters alice_dest_stream = {<br>- "softbridge_dest_PJSIP/Bob-00000001_bob_video", "vp8", AST_MEDIA_TYPE_VIDEO,<br>+ "softbridge_dest_PJSIP/Bob-00000001_bob_video", "h264,vp8", AST_MEDIA_TYPE_VIDEO,<br> };<br> static const struct stream_parameters bob_dest_stream = {<br>- "softbridge_dest_PJSIP/Alice-00000000_alice_video", "h264,vp8", AST_MEDIA_TYPE_VIDEO,<br>+ "softbridge_dest_PJSIP/Alice-00000000_alice_video", "vp8", AST_MEDIA_TYPE_VIDEO,<br> };<br> struct ast_stream_topology *topology_alice = NULL;<br> struct ast_stream_topology *topology_bob = NULL;<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7876">change 7876</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7876"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6b1dd8bed10439d3c7406f033eb1896b6c419147 </div>
<div style="display:none"> Gerrit-Change-Number: 7876 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>