Changeset 4099
- Timestamp:
- Apr 26, 2012 4:46:27 PM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/clock_thread.c
r3854 r4099 84 84 85 85 #if PJ_HAS_INT64 86 if (ts.u64 > 0x3FFFFFFFFFFFFFUL )86 if (ts.u64 > 0x3FFFFFFFFFFFFFULL) 87 87 return (pj_uint32_t)(ts.u64 / clocksrc->clock_rate * 1000); 88 88 else -
pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c
r4059 r4099 469 469 max_len = stream->out_rtcp_pkt_size; 470 470 } else { 471 pkt = sr_rr_pkt;471 pkt = (pj_uint8_t*)sr_rr_pkt; 472 472 max_len = len; 473 473 } -
pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h
r4071 r4099 362 362 } pjsua_vid_win; 363 363 364 365 typedef struct pjsua_timer_list 366 { 367 PJ_DECL_LIST_MEMBER(struct pjsua_timer_list); 368 pj_timer_entry entry; 369 void (*cb)(void *user_data); 370 void *user_data; 371 } pjsua_timer_list; 372 373 364 374 /** 365 375 * Global pjsua application data. … … 464 474 465 475 /* Timer entry list */ 466 struct timer_list 467 { 468 PJ_DECL_LIST_MEMBER(struct timer_list); 469 pj_timer_entry entry; 470 void (*cb)(void *user_data); 471 void *user_data; 472 } timer_list; 476 pjsua_timer_list timer_list; 473 477 pj_mutex_t *timer_mutex; 474 478 }; -
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c
r4086 r4099 2630 2630 pj_timer_entry *entry) 2631 2631 { 2632 struct timer_list *tmr = (structtimer_list *)entry->user_data;2632 pjsua_timer_list *tmr = (pjsua_timer_list *)entry->user_data; 2633 2633 void (*cb)(void *user_data) = tmr->cb; 2634 2634 void *user_data = tmr->user_data; … … 2651 2651 unsigned msec_delay) 2652 2652 { 2653 structtimer_list *tmr = NULL;2653 pjsua_timer_list *tmr = NULL; 2654 2654 pj_status_t status; 2655 2655 pj_time_val delay; … … 2658 2658 2659 2659 if (pj_list_empty(&pjsua_var.timer_list)) { 2660 tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, structtimer_list);2660 tmr = PJ_POOL_ALLOC_T(pjsua_var.pool, pjsua_timer_list); 2661 2661 } else { 2662 2662 tmr = pjsua_var.timer_list.next;
Note: See TracChangeset
for help on using the changeset viewer.