chore: allow ka_cfg to be modifiable through the callback on_stream_p… (#4470)

Author: impegoraro

pjsip/include/pjsua-lib/pjsua.h

@@ -1311,7 +1311,7 @@ typedef struct pjsua_callback
      * (as opposed to on_stream_created() and on_stream_created2() which are
      * called *after* the session has been created). The application may change
      * some stream info parameter values, i.e: jb_init, jb_min_pre, jb_max_pre,
-     * jb_max, use_ka, rtcp_sdes_bye_disabled, jb_discard_algo (audio),
+     * jb_max, use_ka, ka_cfg, rtcp_sdes_bye_disabled, jb_discard_algo (audio),
      * rx_event_pt (audio), codec_param->enc_fmt (video).
      *
      * @param call_id       Call identification.

pjsip/include/pjsua2/call.hpp

@@ -689,6 +689,21 @@ struct StreamInfo
      * enabled?
      */
     bool                useKa;
+
+    /**
+     *  Number of keepalive messages to be sent
+     */
+    unsigned            startCountKa;
+
+    /**
+     * Keepalive interval after the stream is created.
+     */
+    unsigned startIntervalKa;
+
+    /**
+     *  Keepalive sending interval.
+     */
+    unsigned intervalKa;
 #endif
 
     /**
@@ -2003,8 +2018,8 @@ class Call
      * (as opposed to onStreamCreated(), which is called *after* the session
      * has been created). The application may change
      * some stream info parameter values, i.e: jbInit, jbMinPre, jbMaxPre,
-     * jbMax, useKa, rtcpSdesByeDisabled, jbDiscardAlgo (audio),
-     * vidCodecParam.encFmt (video).
+     * jbMax, useKa, startCountKa, startIntervalKa, intervalKa,
+     * rtcpSdesByeDisabled, jbDiscardAlgo (audio), vidCodecParam.encFmt (video).
      *
      * @param prm       Callback parameter.
      */

pjsip/src/pjsua-lib/pjsua_aud.c

@@ -664,6 +664,8 @@ pj_status_t pjsua_aud_channel_update(pjsua_call_media *call_med,
             si->jb_discard_algo = prm.stream_info.info.aud.jb_discard_algo;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
             si->use_ka = prm.stream_info.info.aud.use_ka;
+
+            si->ka_cfg = prm.stream_info.info.aud.ka_cfg;
 #endif
             si->rtcp_sdes_bye_disabled = prm.stream_info.info.aud.rtcp_sdes_bye_disabled;
             si->rx_event_pt = prm.stream_info.info.aud.rx_event_pt;

pjsip/src/pjsua-lib/pjsua_txt.c

@@ -220,6 +220,8 @@ pj_status_t pjsua_txt_channel_update(pjsua_call_media *call_med,
             si->jb_discard_algo = prm.stream_info.info.aud.jb_discard_algo;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
             si->use_ka = prm.stream_info.info.aud.use_ka;
+
+            si->ka_cfg = prm.stream_info.info.aud.ka_cfg;
 #endif
             si->rtcp_sdes_bye_disabled =
                 prm.stream_info.info.aud.rtcp_sdes_bye_disabled;

pjsip/src/pjsua-lib/pjsua_vid.c

@@ -1216,6 +1216,8 @@ pj_status_t pjsua_vid_channel_update(pjsua_call_media *call_med,
             si->jb_max = prm.stream_info.info.vid.jb_max;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
             si->use_ka = prm.stream_info.info.vid.use_ka;
+
+            si->ka_cfg = prm.stream_info.info.vid.ka_cfg;
 #endif
             si->rtcp_sdes_bye_disabled = prm.stream_info.info.vid.rtcp_sdes_bye_disabled;
             si->codec_param->enc_fmt = prm.stream_info.info.vid.codec_param->enc_fmt;

pjsip/src/pjsua2/call.cpp

@@ -370,6 +370,9 @@ void StreamInfo::fromPj(const pjsua_stream_info &info)
         jbDiscardAlgo = info.info.aud.jb_discard_algo;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
         useKa = PJ2BOOL(info.info.aud.use_ka);
+        startCountKa = info.info.aud.ka_cfg.start_count;
+        startIntervalKa =  info.info.aud.ka_cfg.start_interval;
+        intervalKa = info.info.aud.ka_cfg.ka_interval;
 #endif
         rtcpSdesByeDisabled = PJ2BOOL(info.info.aud.rtcp_sdes_bye_disabled);
     } else if (type == PJMEDIA_TYPE_VIDEO) {
@@ -391,6 +394,9 @@ void StreamInfo::fromPj(const pjsua_stream_info &info)
         jbDiscardAlgo = PJMEDIA_JB_DISCARD_NONE;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
         useKa = PJ2BOOL(info.info.vid.use_ka);
+        startCountKa = info.info.vid.ka_cfg.start_count;
+        startIntervalKa =  info.info.vid.ka_cfg.start_interval;
+        intervalKa = info.info.vid.ka_cfg.ka_interval;
 #endif
         rtcpSdesByeDisabled = PJ2BOOL(info.info.vid.rtcp_sdes_bye_disabled);
     } else if (type == PJMEDIA_TYPE_TEXT) {
@@ -411,6 +417,9 @@ void StreamInfo::fromPj(const pjsua_stream_info &info)
         jbDiscardAlgo = PJMEDIA_JB_DISCARD_NONE;
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && (PJMEDIA_STREAM_ENABLE_KA != 0)
         useKa = PJ2BOOL(info.info.txt.use_ka);
+        startCountKa = info.info.txt.ka_cfg.start_count;
+        startIntervalKa =  info.info.txt.ka_cfg.start_interval;
+        intervalKa = info.info.txt.ka_cfg.ka_interval;
 #endif
         rtcpSdesByeDisabled = PJ2BOOL(info.info.txt.rtcp_sdes_bye_disabled);
     }