<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8853">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bridge_softmix: Fix sporadic incorrect video stream mapping.<br><br>When an externally initiated renegotiation occurred it was<br>possible for video streams to be incorrectly remapped,<br>resulting in no video flowing to some receivers.<br><br>This change ensures that only the video source sets up<br>mappings and also that removed streams do not have mappings<br>set up.<br><br>Change-Id: Iab05f2254df3606670774844bb0935f833d3a9b0<br>---<br>M bridges/bridge_softmix.c<br>1 file changed, 5 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 f0a3fb4..b222dde 100644<br>--- a/bridges/bridge_softmix.c<br>+++ b/bridges/bridge_softmix.c<br>@@ -2148,12 +2148,13 @@<br>                                        AST_VECTOR_SIZE(&media_types) - 1, &bridge->channels);<br>                             ast_bridge_channel_lock(participant);<br>                                 ast_channel_lock(participant->chan);<br>-                      } else if (is_video_dest(stream, NULL, NULL)) {<br>-                              /* We expect to never read media from video destination channels, but just<br>-                            * in case, we should set their to_bridge value to -1.<br>+                       } else if (ast_stream_get_type(stream) == AST_MEDIA_TYPE_VIDEO) {<br>+                            /* Video stream mapping occurs directly when a video source stream<br>+                            * is found on a channel. Video streams should otherwise remain<br>+                               * unmapped.<br>                           */<br>                           AST_VECTOR_REPLACE(&participant->stream_map.to_bridge, i, -1);<br>-                        } else {<br>+                     } else if (ast_stream_get_state(stream) != AST_STREAM_STATE_REMOVED) {<br>                                /* XXX This is copied from ast_stream_topology_map(). This likely could<br>                                * be factored out in some way<br>                                 */<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8853">change 8853</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/8853"/><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: Iab05f2254df3606670774844bb0935f833d3a9b0 </div>
<div style="display:none"> Gerrit-Change-Number: 8853 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.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>