Changeset 4428 for pjproject

Timestamp:

Mar 7, 2013 8:25:35 AM (12 years ago)

Author:

ming

Message:

Fixed #1635: Fixed the backport of ticket #1568 (smarter media update) to version 1.x

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1857 +1857 @@
         return status;
 
+    /* Get audio index from the negotiated SDP */
+    audio_idx = find_audio_index(local_sdp, PJ_TRUE);
+
+    /* Update audio index from the negotiated SDP */
+    call->audio_idx = audio_idx;
+
+    /* Find which session is audio */
+    PJ_ASSERT_RETURN(call->audio_idx != -1, PJ_EBUG);
+    PJ_ASSERT_RETURN(call->audio_idx < (int)sess_info.stream_cnt, PJ_EBUG);
+    si = &sess_info.stream_info[call->audio_idx];
+
     /* Override ptime, if this option is specified. */
     if (pjsua_var.media_cfg.ptime != 0) {
@@ -1869 +1880 @@
         si->param->setting.vad = 0;
     }
-
-    /* Get audio index from the negotiated SDP */
-    audio_idx = find_audio_index(local_sdp, PJ_TRUE);
 
     /* Get previous media status */
@@ -1894 +1902 @@
     }
 
-    /* Update audio index from the negotiated SDP */
-    call->audio_idx = audio_idx;
-
-    /* Find which session is audio */
-    PJ_ASSERT_RETURN(call->audio_idx != -1, PJ_EBUG);
-    PJ_ASSERT_RETURN(call->audio_idx < (int)sess_info.stream_cnt, PJ_EBUG);
-    si = &sess_info.stream_info[call->audio_idx];
-    
     /* Reset session info with only one media stream */
     sess_info.stream_cnt = 1;