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

Timestamp:

Dec 4, 2018 2:16:47 AM (5 years ago)

Author:

ming

Message:

Fixed #2165: Support video only call in pjsua

File:

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

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

@@ -1247 +1247 @@
 
 /* Go through the list of media in the SDP, find acceptable media, and
- * sort them based on the "quality" of the media, and store the indexes
- * in the specified array. Media with the best quality will be listed
- * first in the array. The quality factors considered currently is
- * encryption.
+ * sort them based on the below criteria, and store the indexes
+ * in the specified array. The criteria is as follows:
+ * 1. enabled, i.e: SDP media port not zero
+ * 2. transport protocol in the SDP matching account config's
+ *    secure media transport usage (\a use_srtp field).
+ * 3. active, i.e: SDP media direction is not "inactive"
+ * 4. media order (according to the SDP).
  */
 static void sort_media(const pjmedia_sdp_session *sdp,
@@ -2014 +2017 @@
         sort_media(rem_sdp, &STR_AUDIO, acc->cfg.use_srtp,
                    maudidx, &maudcnt, &mtotaudcnt);
-        if (maudcnt==0) {
-            /* Expecting audio in the offer */
-            if (sip_err_code) *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
-            status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE_HERE);
-            goto on_error;
-        }
 
 #if PJMEDIA_HAS_VIDEO
@@ -2028 +2025 @@
         PJ_UNUSED_ARG(STR_VIDEO);
 #endif
+
+        if (maudcnt + mvidcnt == 0) {
+            /* Expecting audio or video in the offer */
+            if (sip_err_code) *sip_err_code = PJSIP_SC_NOT_ACCEPTABLE_HERE;
+            status = PJSIP_ERRNO_FROM_SIP_STATUS(PJSIP_SC_NOT_ACCEPTABLE_HERE);
+            goto on_error;
+        }
 
         /* Update media count only when remote add any media, this media count
@@ -2231 +2235 @@
     }
 
-    call->audio_idx = maudidx[0];
-
-    PJ_LOG(4,(THIS_FILE, "Media index %d selected for audio call %d",
-              call->audio_idx, call->index));
+    if (maudcnt > 0) {
+        call->audio_idx = maudidx[0];
+
+        PJ_LOG(4,(THIS_FILE, "Media index %d selected for audio call %d",
+                  call->audio_idx, call->index));
+    } else {
+        call->audio_idx = -1;
+    }
 
     if (pending_med_tp) {