Changeset 4130

Timestamp:

May 17, 2012 8:35:51 AM (12 years ago)

Author:

nanang

Message:

Re #1509: backported r4122-r4129.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/alsa_dev.c (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)
• third_party/srtp/crypto/replay/rdb.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -1140 +1140 @@
 /**
  * Duration for progressive discard algotithm in jitter buffer to discard
- * an excessive frame when burst is equal to or lower than
+ * an excessive frame when burst is equal to or greater than
  * PJMEDIA_JBUF_PRO_DISC_MAX_BURST, in milliseconds.
  *

pjproject/trunk/pjmedia/src/pjmedia-audiodev/alsa_dev.c

@@ -548 +548 @@
     unsigned int rate;
     snd_pcm_uframes_t tmp_buf_size;
+    snd_pcm_uframes_t tmp_period_size;
 
     if (param->play_id < 0 || param->play_id >= stream->af->dev_cnt)
@@ -614 +615 @@
     TRACE_((THIS_FILE, "open_playback: set period size: %d",
             stream->pb_frames));
+    tmp_period_size = stream->pb_frames;
     snd_pcm_hw_params_set_period_size_near (stream->pb_pcm, params,
-                                            &stream->pb_frames, NULL);
+                                            &tmp_period_size, NULL);
     TRACE_((THIS_FILE, "open_playback: period size set to: %d",
-            stream->pb_frames));
+            tmp_period_size));
 
     /* Set the sound device buffer size and latency */
@@ -664 +666 @@
     unsigned int rate;
     snd_pcm_uframes_t tmp_buf_size;
+    snd_pcm_uframes_t tmp_period_size;
 
     if (param->rec_id < 0 || param->rec_id >= stream->af->dev_cnt)
@@ -730 +733 @@
     TRACE_((THIS_FILE, "open_capture: set period size: %d",
             stream->ca_frames));
+    tmp_period_size = stream->ca_frames;
     snd_pcm_hw_params_set_period_size_near (stream->ca_pcm, params,
-                                            &stream->ca_frames, NULL);
+                                            &tmp_period_size, NULL);
     TRACE_((THIS_FILE, "open_capture: period size set to: %d",
-            stream->ca_frames));
+            tmp_period_size));
 
     /* Set the sound device buffer size and latency */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -676 +676 @@
     pj_str_t acc_proxy[PJSUA_ACC_MAX_PROXIES];
     pj_bool_t update_reg = PJ_FALSE;
+    pj_bool_t unreg_first = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
 
@@ -803 +804 @@
         acc->srv_port = 0;
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -857 +859 @@
                             &cfg->force_contact);
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1101 +1104 @@
         }
         update_reg = PJ_TRUE;
+        unreg_first = PJ_TRUE;
     }
 
@@ -1109 +1113 @@
     {
         update_reg = PJ_TRUE;
+    }
+
+    /* Unregister first */
+    if (unreg_first) {
+        pjsua_acc_set_registration(acc->index, PJ_FALSE);
+        if (acc->regc != NULL) {
+            pjsip_regc_destroy(acc->regc);
+            acc->regc = NULL;
+            acc->contact.slen = 0;
+        }
     }
 

pjproject/trunk/third_party/srtp/crypto/replay/rdb.c

@@ -116 +116 @@
     /* shift the window forward by delta bits*/
     v128_left_shift(&rdb->bitmask, delta);
-    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-delta);
+    v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1);
     rdb->window_start += delta;