res_pjsip_session: Reduce (and improve) SDP renegotiation.

When pruning a request to change the topology of a channel be
more intelligent about the resulting topology that is actually
used for SDP renegotiation.

In a case where a stream has not already been negotiated we
don't need to renegotiate and offer a declined stream. This can
occur if something in Asterisk (such as ConfBridge) requests
to add video to a PJSIP channel that has no video codecs configured.
In this case since the stream did not already exist we can safely
remove the stream from the requested topology, resulting in no
renegotiation occurring.

In a case where a renegotiation is requested with a codec that is
not supported we can reuse the formats of the existing stream if
it exists to ensure that the stream continues to flow, instead of
removing it.

Change-Id: I636540798d55922377318fe619c510fb6ed125fb

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 2beb6dcd508d7cfc4bde04a844e6fd5bc9567a74..d61799bea326b01ee7d7c564d2f9f17fcb2d652f 100644 (file)
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -1482,8 +1482,15 @@ int ast_sip_session_refresh(struct ast_sip_session *session,
                         * are configurable on the endpoint.
                         */
                        for (index = 0; index < ast_stream_topology_get_count(media_state->topology); ++index) {
+                               struct ast_stream *existing_stream = NULL;
+
                                stream = ast_stream_topology_get_stream(media_state->topology, index);
 
+                               if (session->active_media_state->topology &&
+                                       index < ast_stream_topology_get_count(session->active_media_state->topology)) {
+                                       existing_stream = ast_stream_topology_get_stream(session->active_media_state->topology, index);
+                               }
+
                                if (is_stream_limitation_reached(ast_stream_get_type(stream), session->endpoint, type_streams)) {
                                        if (index < AST_VECTOR_SIZE(&media_state->sessions)) {
                                                struct ast_sip_session_media *session_media = AST_VECTOR_GET(&media_state->sessions, index);
@@ -1516,8 +1523,28 @@ int ast_sip_session_refresh(struct ast_sip_session *session,
                                        ast_format_cap_get_compatible(ast_stream_get_formats(stream), session->endpoint->media.codecs, joint_cap);
                                        if (!ast_format_cap_count(joint_cap)) {
                                                ao2_ref(joint_cap, -1);
-                                               ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
-                                               continue;
+
+                                               if (!existing_stream) {
+                                                       /* If there is no existing stream we can just not have this stream in the topology
+                                                        * at all.
+                                                        */
+                                                       ast_stream_topology_del_stream(media_state->topology, index);
+                                                       index -= 1;
+                                                       continue;
+                                               } else if (ast_stream_get_state(stream) != ast_stream_get_state(existing_stream) ||
+                                                               strcmp(ast_stream_get_name(stream), ast_stream_get_name(existing_stream))) {
+                                                       /* If the underlying stream is a different type or different name then we have to
+                                                        * mark it as removed, as it is replacing an existing stream. We do this so order
+                                                        * is preserved.
+                                                        */
+                                                       ast_stream_set_state(stream, AST_STREAM_STATE_REMOVED);
+                                                       continue;
+                                               } else {
+                                                       /* However if the stream is otherwise remaining the same we can keep the formats
+                                                        * that exist on it already which allows media to continue to flow.
+                                                        */
+                                                       joint_cap = ao2_bump(ast_stream_get_formats(existing_stream));
+                                               }
                                        }
                                        ast_stream_set_formats(stream, joint_cap);
                                }