Changeset 4428


Ignore:
Timestamp:
Mar 7, 2013 8:25:35 AM (7 years ago)
Author:
ming
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

    r4426 r4428  
    18571857        return status; 
    18581858 
     1859    /* Get audio index from the negotiated SDP */ 
     1860    audio_idx = find_audio_index(local_sdp, PJ_TRUE); 
     1861 
     1862    /* Update audio index from the negotiated SDP */ 
     1863    call->audio_idx = audio_idx; 
     1864 
     1865    /* Find which session is audio */ 
     1866    PJ_ASSERT_RETURN(call->audio_idx != -1, PJ_EBUG); 
     1867    PJ_ASSERT_RETURN(call->audio_idx < (int)sess_info.stream_cnt, PJ_EBUG); 
     1868    si = &sess_info.stream_info[call->audio_idx]; 
     1869 
    18591870    /* Override ptime, if this option is specified. */ 
    18601871    if (pjsua_var.media_cfg.ptime != 0) { 
     
    18691880        si->param->setting.vad = 0; 
    18701881    } 
    1871  
    1872     /* Get audio index from the negotiated SDP */ 
    1873     audio_idx = find_audio_index(local_sdp, PJ_TRUE); 
    18741882 
    18751883    /* Get previous media status */ 
     
    18941902    } 
    18951903 
    1896     /* Update audio index from the negotiated SDP */ 
    1897     call->audio_idx = audio_idx; 
    1898  
    1899     /* Find which session is audio */ 
    1900     PJ_ASSERT_RETURN(call->audio_idx != -1, PJ_EBUG); 
    1901     PJ_ASSERT_RETURN(call->audio_idx < (int)sess_info.stream_cnt, PJ_EBUG); 
    1902     si = &sess_info.stream_info[call->audio_idx]; 
    1903      
    19041904    /* Reset session info with only one media stream */ 
    19051905    sess_info.stream_cnt = 1; 
Note: See TracChangeset for help on using the changeset viewer.