Signed-off-by: Pesala Silva <[email protected]>Bug_Fixes_and_optim… (#4585)

Author: PesalaDeSilva

pjmedia/src/pjmedia/null_port.c

@@ -94,7 +94,11 @@ static pj_status_t null_get_frame(pjmedia_port *this_port,
 {
     frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
     frame->size = PJMEDIA_PIA_AVG_FSZ(&this_port->info);
+#if PJ_HAS_INT64
+    frame->timestamp.u64 += PJMEDIA_PIA_SPF(&this_port->info);
+#else
     frame->timestamp.u32.lo += PJMEDIA_PIA_SPF(&this_port->info);
+#endif
     pjmedia_zero_samples((pj_int16_t*)frame->buf, 
                           PJMEDIA_PIA_SPF(&this_port->info));
 

pjmedia/src/pjmedia/silencedet.c

@@ -327,6 +327,10 @@ PJ_DEF(pj_bool_t) pjmedia_silence_det_detect( pjmedia_silence_det *sd,
                                               pj_int32_t *p_level)
 {
     pj_uint32_t level;
+
+    /* If VAD is disabled, return false */
+    if (!p_level && (sd->mode == VAD_MODE_NONE))
+        return PJ_FALSE;
 
     /* Calculate average signal level. */
     level = pjmedia_calc_avg_signal(samples, count);

pjsip/include/pjsua-lib/pjsua_internal.h

@@ -580,7 +580,7 @@ struct pjsua_data
     /* Calls: */
     pjsua_config         ua_cfg;                /**< UA config.         */
     unsigned             call_cnt;              /**< Call counter.      */
-    pjsua_call           calls[PJSUA_MAX_CALLS];/**< Calls array.       */
+    pjsua_call          *calls;                 /**< Calls array.       */
     pjsua_call_id        next_call_id;          /**< Next call id to use*/
 
     /* Buddy; */

pjsip/src/pjsip/sip_transaction.c

@@ -2651,6 +2651,8 @@ PJ_DEF(pj_status_t) pjsip_tsx_retransmit_no_state(pjsip_transaction *tsx,
 {
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(tsx != NULL, PJ_EINVAL);
+
     pj_grp_lock_acquire(tsx->grp_lock);
     if (tdata == NULL) {
         tdata = tsx->last_tx;
@@ -2665,7 +2667,7 @@ PJ_DEF(pj_status_t) pjsip_tsx_retransmit_no_state(pjsip_transaction *tsx,
     if (status == PJ_SUCCESS) {
         pjsip_tx_data_dec_ref(tdata);
     }
-
+   
     return status;
 }
 

pjsip/src/pjsip/sip_util.c

@@ -1255,7 +1255,8 @@ static void stateless_send_transport_cb( void *token,
 
             if (tdata->via_addr.host.slen > 0 &&
                 (!tdata->via_tp ||
-                 tdata->via_tp == (void *)stateless_data->cur_transport))
+                    tdata->via_tp == (void*)stateless_data->cur_transport ||
+                    tdata->msg->line.req.method.id == PJSIP_CANCEL_METHOD))
             {
                 via->sent_by = tdata->via_addr;
 

pjsip/src/pjsua-lib/pjsua_call.c

@@ -209,17 +209,22 @@ pj_status_t pjsua_call_subsys_init(const pjsua_config *cfg)
     const pj_str_t str_trickle_ice = { "trickle-ice", 11 };
     pj_status_t status;
 
-    /* Init calls array. */
-    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.calls); ++i)
-        reset_call(i);
-
     /* Copy config */
     pjsua_config_dup(pjsua_var.pool, &pjsua_var.ua_cfg, cfg);
 
     /* Verify settings */
-    if (pjsua_var.ua_cfg.max_calls >= PJSUA_MAX_CALLS) {
+    if (pjsua_var.ua_cfg.max_calls > PJSUA_MAX_CALLS) 
         pjsua_var.ua_cfg.max_calls = PJSUA_MAX_CALLS;
-    }
+    
+    pjsua_var.calls = (pjsua_call *)pj_pool_zalloc(pjsua_var.pool,
+                                                   sizeof(pjsua_call) *
+                                                   pjsua_var.ua_cfg.max_calls);
+    if (!pjsua_var.calls)
+        return PJ_ENOMEM;
+
+    /* Init calls array. */
+    for (i = 0U; i < pjsua_var.ua_cfg.max_calls; ++i)
+        reset_call(i);
 
     /* Check the route URI's and force loose route if required */
     for (i=0; i<pjsua_var.ua_cfg.outbound_proxy_cnt; ++i) {
@@ -2942,8 +2947,8 @@ PJ_DEF(pj_status_t) pjsua_call_answer2(pjsua_call_id call_id,
                                                     msg_data);
         }
         pj_list_push_back(&call->async_call.call_var.inc_call.answers,
-                          answer);
-
+            answer);
+       
         PJSUA_UNLOCK();
         if (dlg) pjsip_dlg_dec_lock(dlg);
         pj_log_pop_indent();