Changeset 4524


Ignore:
Timestamp:
May 24, 2013 4:27:59 AM (7 years ago)
Author:
nanang
Message:

Fixed #1670:

  • Added 'no_rtcp_sdes_bye' to 'pjsua_media_config'.
  • Modified behaviour of video stream in PJSUA to match audio stream behaviour, i.e: always send RTCP SDES when stream starts/stops and send RTCP BYE when stream stops, regardless whether 'no_rtcp_sdes_bye' is set.
Location:
pjproject/trunk/pjsip
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

    r4463 r4524  
    56625662     */ 
    56635663    pj_bool_t no_smart_media_update; 
     5664 
     5665    /** 
     5666     * Omit RTCP SDES and BYE in outgoing RTCP packet, this setting will be 
     5667     * applied for both audio and video streams. Note that, when RTCP SDES 
     5668     * and BYE are set to be omitted, RTCP SDES will still be sent once when 
     5669     * the stream starts/stops and RTCP BYE will be sent once when the stream 
     5670     * stops. 
     5671     * 
     5672     * Default: PJ_FALSE 
     5673     */ 
     5674    pj_bool_t no_rtcp_sdes_bye; 
    56645675}; 
    56655676 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_aud.c

    r4507 r4524  
    586586    pj_log_push_indent(); 
    587587 
    588     si->rtcp_sdes_bye_disabled = PJ_TRUE; 
     588    si->rtcp_sdes_bye_disabled = pjsua_var.media_cfg.no_rtcp_sdes_bye; 
    589589 
    590590    /* Check if no media is active */ 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

    r4341 r4524  
    730730    pj_log_push_indent(); 
    731731 
    732     si->rtcp_sdes_bye_disabled = PJ_TRUE; 
     732    si->rtcp_sdes_bye_disabled = pjsua_var.media_cfg.no_rtcp_sdes_bye;; 
    733733 
    734734    /* Check if no media is active */ 
     
    804804        if (status != PJ_SUCCESS) 
    805805            goto on_error; 
     806 
     807        if (call_med->prev_state == PJSUA_CALL_MEDIA_NONE) 
     808            pjmedia_vid_stream_send_rtcp_sdes(call_med->strm.v.stream); 
    806809 
    807810        /* Setup decoding direction */ 
     
    967970    PJ_LOG(4,(THIS_FILE, "Stopping video stream..")); 
    968971    pj_log_push_indent(); 
     972     
     973    pjmedia_vid_stream_send_rtcp_bye(strm); 
    969974 
    970975    if (call_med->strm.v.cap_win_id != PJSUA_INVALID_ID) { 
Note: See TracChangeset for help on using the changeset viewer.