Changeset 4120
- Timestamp:
- May 12, 2012 7:18:09 AM (13 years ago)
- Location:
- pjproject/trunk/pjmedia/src/pjmedia
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/stream.c
r4108 r4120 1166 1166 &frame->timestamp); 1167 1167 if (dtx_duration > 1168 PJMEDIA_STREAM_KA_INTERVAL * stream->port.info.clock_rate)1168 PJMEDIA_STREAM_KA_INTERVAL * PJMEDIA_PIA_SRATE(&stream->port.info)) 1169 1169 { 1170 1170 send_keep_alive_packet(stream); -
pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c
r4115 r4120 69 69 #endif 70 70 71 /* Video stream keep-alive feature is currently disabled. */ 72 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0 73 # undef PJMEDIA_STREAM_ENABLE_KA 74 # define PJMEDIA_STREAM_ENABLE_KA 0 75 #endif 76 71 77 72 78 /** … … 402 408 403 409 /* Keep-alive packet is empty RTP */ 410 pjmedia_vid_channel *channel = (pjmedia_vid_channel *)stream; 404 411 pj_status_t status; 405 412 void *pkt; … … 423 430 424 431 /* Send RTCP */ 425 send_rtcp(stream, PJ_TRUE, PJ_FALSE , PJ_FALSE);432 send_rtcp(stream, PJ_TRUE, PJ_FALSE); 426 433 427 434 #elif PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_USER 428 435 429 436 /* Keep-alive packet is defined in PJMEDIA_STREAM_KA_USER_PKT */ 437 pjmedia_vid_channel *channel = (pjmedia_vid_channel *)stream; 430 438 int pkt_len; 431 439 const pj_str_t str_ka = PJMEDIA_STREAM_KA_USER_PKT; … … 796 804 dtx_duration = pj_timestamp_diff32(&stream->last_frm_ts_sent, 797 805 &frame->timestamp); 798 if (dtx_duration > 799 PJMEDIA_STREAM_KA_INTERVAL * channel->port.info.clock_rate) 806 /* Video stream keep-alive feature is currently disabled. */ 807 /* 808 if (dtx_duration > 809 PJMEDIA_STREAM_KA_INTERVAL * 810 PJMEDIA_PIA_SRATE(&channel->port.info)) 800 811 { 801 812 send_keep_alive_packet(stream); 802 813 stream->last_frm_ts_sent = frame->timestamp; 803 814 } 815 */ 804 816 } 805 817 #endif
Note: See TracChangeset
for help on using the changeset viewer.