Changeset 5878 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Sep 4, 2018 3:12:58 PM (6 years ago)

Author:

riza

Message:

Close #2145: Don't rearrange media when sending re-INVITE with
PJSUA_CALL_REINIT_MEDIA.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1359 +1359 @@
  */
 static void sort_media2(const pjsua_call_media *call_med,
+                        pj_bool_t check_tp,
                         unsigned call_med_cnt,
                         pjmedia_type type,
@@ -1387 +1388 @@
 
         /* Is it active? */
-        if (!call_med[i].tp) {
+        if (check_tp && !call_med[i].tp) {
             score[i] -= 10;
         }
@@ -2047 +2048 @@
          * Otherwise, apply media count from the call setting directly.
          */
-        if (reinit && (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) == 0) {
+        if (reinit) {
+            pj_bool_t sort_check_tp;
+
+            /* Media sorting below will check transport, i.e: media without
+             * transport will have lower priority. If PJSUA_CALL_REINIT_MEDIA
+             * is set, we must not check transport.
+             */
+            sort_check_tp = !(call->opt.flag & PJSUA_CALL_REINIT_MEDIA);
 
             /* We are sending reoffer, check media count for each media type
              * from the existing call media list.
              */
-            sort_media2(call->media_prov, call->med_prov_cnt,
+            sort_media2(call->media_prov, sort_check_tp, call->med_prov_cnt,
                         PJMEDIA_TYPE_AUDIO, maudidx, &maudcnt, &mtotaudcnt);
 
@@ -2058 +2066 @@
             //pj_assert(maudcnt > 0);
 
-            sort_media2(call->media_prov, call->med_prov_cnt,
+            sort_media2(call->media_prov, sort_check_tp, call->med_prov_cnt,
                         PJMEDIA_TYPE_VIDEO, mvididx, &mvidcnt, &mtotvidcnt);
 
@@ -2088 +2096 @@
             }
             mvidcnt = call->opt.vid_cnt;
+
+            /* In case of media reinit, 'med_prov_cnt' may be decreased
+             * because the new call->opt says so. As media count should
+             * never decrease, we should verify 'med_prov_cnt' to be
+             * at least equal to 'med_cnt' (see also #1987).
+             */
+            if ((call->opt.flag & PJSUA_CALL_REINIT_MEDIA) &&
+                call->med_prov_cnt < call->med_cnt)
+            {
+                call->med_prov_cnt = call->med_cnt;
+            }
 
         } else {
@@ -2113 +2132 @@
                 }
 #endif
-            }
-
-            /* In case of media reinit, 'med_prov_cnt' may be decreased
-             * because the new call->opt says so. As media count should
-             * never decrease, we should verify 'med_prov_cnt' to be
-             * at least equal to 'med_cnt' (see also #1987).
-             */
-            if (reinit && (call->opt.flag & PJSUA_CALL_REINIT_MEDIA) &&
-                call->med_prov_cnt < call->med_cnt)
-            {
-                call->med_prov_cnt = call->med_cnt;
             }
         }