<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14512">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kevin Harwell: Looks good to me, approved
George Joseph: Looks good to me, but someone else must approve
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix: Add additional old states for adding new source.<br><br>There are three states that an old stream can be in to allow<br>becoming a source stream in a new stream:<br><br>1. Removed<br>2. Inactive<br>3. Sendonly<br><br>This change adds the two missing ones, inactive and sendonly,<br>so if a stream transitions from those to a state where they are<br>providing video to Asterisk we properly re-negotiate the other<br>participants.<br><br>ASTERISK-28944<br><br>Change-Id: Id8256b9b254b403411586284bbaedbf50452de01<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 2 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c</span><br><span>index 36d82a5..817f8b2 100644</span><br><span>--- a/bridges/bridge_softmix.c</span><br><span>+++ b/bridges/bridge_softmix.c</span><br><span>@@ -2293,7 +2293,8 @@</span><br><span> ast_stream_get_state(new_stream) != AST_STREAM_STATE_SENDRECV && ast_stream_get_state(new_stream) != AST_STREAM_STATE_RECVONLY) {</span><br><span> /* If a stream renegotiates and is removed then we remove it */</span><br><span> removed_streams[removed_streams_count++] = index;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (ast_stream_get_state(old_stream) == AST_STREAM_STATE_REMOVED &&</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ((ast_stream_get_state(old_stream) == AST_STREAM_STATE_REMOVED || ast_stream_get_state(old_stream) == AST_STREAM_STATE_INACTIVE ||</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_stream_get_state(old_stream) == AST_STREAM_STATE_SENDONLY) &&</span><br><span> ast_stream_get_state(new_stream) != AST_STREAM_STATE_INACTIVE && ast_stream_get_state(new_stream) != AST_STREAM_STATE_SENDONLY &&</span><br><span> ast_stream_get_state(new_stream) != AST_STREAM_STATE_REMOVED) {</span><br><span> /* If a stream renegotiates and is added then we add it */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14512">change 14512</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/14512"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Id8256b9b254b403411586284bbaedbf50452de01 </div>
<div style="display:none"> Gerrit-Change-Number: 14512 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>