Changeset 4130 for pjproject/trunk
- Timestamp:
- May 17, 2012 8:35:51 AM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk
- Property svn:mergeinfo changed
/pjproject/branches/1.x merged: 4124-4127
- Property svn:mergeinfo changed
-
pjproject/trunk/pjmedia/include/pjmedia/config.h
r4006 r4130 1140 1140 /** 1141 1141 * Duration for progressive discard algotithm in jitter buffer to discard 1142 * an excessive frame when burst is equal to or lower than1142 * an excessive frame when burst is equal to or greater than 1143 1143 * PJMEDIA_JBUF_PRO_DISC_MAX_BURST, in milliseconds. 1144 1144 * -
pjproject/trunk/pjmedia/src/pjmedia-audiodev/alsa_dev.c
r3553 r4130 548 548 unsigned int rate; 549 549 snd_pcm_uframes_t tmp_buf_size; 550 snd_pcm_uframes_t tmp_period_size; 550 551 551 552 if (param->play_id < 0 || param->play_id >= stream->af->dev_cnt) … … 614 615 TRACE_((THIS_FILE, "open_playback: set period size: %d", 615 616 stream->pb_frames)); 617 tmp_period_size = stream->pb_frames; 616 618 snd_pcm_hw_params_set_period_size_near (stream->pb_pcm, params, 617 & stream->pb_frames, NULL);619 &tmp_period_size, NULL); 618 620 TRACE_((THIS_FILE, "open_playback: period size set to: %d", 619 stream->pb_frames));621 tmp_period_size)); 620 622 621 623 /* Set the sound device buffer size and latency */ … … 664 666 unsigned int rate; 665 667 snd_pcm_uframes_t tmp_buf_size; 668 snd_pcm_uframes_t tmp_period_size; 666 669 667 670 if (param->rec_id < 0 || param->rec_id >= stream->af->dev_cnt) … … 730 733 TRACE_((THIS_FILE, "open_capture: set period size: %d", 731 734 stream->ca_frames)); 735 tmp_period_size = stream->ca_frames; 732 736 snd_pcm_hw_params_set_period_size_near (stream->ca_pcm, params, 733 & stream->ca_frames, NULL);737 &tmp_period_size, NULL); 734 738 TRACE_((THIS_FILE, "open_capture: period size set to: %d", 735 stream->ca_frames));739 tmp_period_size)); 736 740 737 741 /* Set the sound device buffer size and latency */ -
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c
r4096 r4130 676 676 pj_str_t acc_proxy[PJSUA_ACC_MAX_PROXIES]; 677 677 pj_bool_t update_reg = PJ_FALSE; 678 pj_bool_t unreg_first = PJ_FALSE; 678 679 pj_status_t status = PJ_SUCCESS; 679 680 … … 803 804 acc->srv_port = 0; 804 805 update_reg = PJ_TRUE; 806 unreg_first = PJ_TRUE; 805 807 } 806 808 … … 857 859 &cfg->force_contact); 858 860 update_reg = PJ_TRUE; 861 unreg_first = PJ_TRUE; 859 862 } 860 863 … … 1101 1104 } 1102 1105 update_reg = PJ_TRUE; 1106 unreg_first = PJ_TRUE; 1103 1107 } 1104 1108 … … 1109 1113 { 1110 1114 update_reg = PJ_TRUE; 1115 } 1116 1117 /* Unregister first */ 1118 if (unreg_first) { 1119 pjsua_acc_set_registration(acc->index, PJ_FALSE); 1120 if (acc->regc != NULL) { 1121 pjsip_regc_destroy(acc->regc); 1122 acc->regc = NULL; 1123 acc->contact.slen = 0; 1124 } 1111 1125 } 1112 1126 -
pjproject/trunk/third_party/srtp/crypto/replay/rdb.c
r1730 r4130 116 116 /* shift the window forward by delta bits*/ 117 117 v128_left_shift(&rdb->bitmask, delta); 118 v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask- delta);118 v128_set_bit(&rdb->bitmask, rdb_bits_in_bitmask-1); 119 119 rdb->window_start += delta; 120 120
Note: See TracChangeset
for help on using the changeset viewer.