Changeset 3708


Ignore:
Timestamp:
Aug 17, 2011 10:03:53 AM (13 years ago)
Author:
nanang
Message:

Re #1320: Fixed SDP negotiator in generating connection info for SDP media answer when the media is deactivated (was always adding connection line for the media, even if SDP session already has one).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

    r3664 r3708  
    11261126                               const pjmedia_sdp_media *offer, 
    11271127                               const pjmedia_sdp_media *preanswer, 
     1128                               const pjmedia_sdp_session *preanswer_sdp, 
    11281129                               pjmedia_sdp_media **p_answer) 
    11291130{ 
     
    11431144    /* If offer has zero port, just clone the offer */ 
    11441145    if (offer->desc.port == 0) { 
    1145         answer = sdp_media_clone_deactivate(pool, offer, preanswer, NULL); 
     1146        answer = sdp_media_clone_deactivate(pool, offer, preanswer, 
     1147                                            preanswer_sdp); 
    11461148        *p_answer = answer; 
    11471149        return PJ_SUCCESS; 
     
    14381440                /* See if it has matching codec. */ 
    14391441                status = match_offer(pool, prefer_remote_codec_order,  
    1440                                      om, im, &am); 
     1442                                     om, im, initial, &am); 
    14411443                if (status == PJ_SUCCESS) { 
    14421444                    /* Mark media as used. */ 
Note: See TracChangeset for help on using the changeset viewer.