From: Andre Noll Date: Sun, 12 Aug 2007 13:56:20 +0000 (+0200) Subject: Merge branch 'chunk_queue' of /home/maan/scm/paraslash_meins/paraslash into tmp X-Git-Tag: v0.2.17~34 X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=2dc34e647ad80b3911e166de27182e94f6043215;hp=245b44acd4f1c16395844683f6aff10699967dc0;p=paraslash.git Merge branch 'chunk_queue' of /home/maan/scm/paraslash_meins/paraslash into tmp --- diff --git a/ortp_recv.c b/ortp_recv.c index cb0260d8..fca470ed 100644 --- a/ortp_recv.c +++ b/ortp_recv.c @@ -269,11 +269,9 @@ static int ortp_recv_open(struct receiver_node *rn) rtp_session_set_local_addr(pord->session, c->host_arg, c->port_arg); rtp_session_set_remote_addr(pord->session, c->host_arg, c->port_arg); rtp_session_set_payload_type(pord->session, PAYLOAD_AUDIO_CONTINUOUS); - if (c->jitter_compensation_arg) { - rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE); - rtp_session_set_jitter_compensation(pord->session, + rtp_session_enable_adaptive_jitter_compensation(pord->session, TRUE); + rtp_session_set_jitter_compensation(pord->session, c->jitter_compensation_arg); - } return 1; } diff --git a/ortp_recv.ggo b/ortp_recv.ggo index 4ed5a037..192f21c2 100644 --- a/ortp_recv.ggo +++ b/ortp_recv.ggo @@ -1,4 +1,4 @@ section "ortp options" option "host" i "ip or host to receive rtp packets from" string default="224.0.1.38" optional option "port" p "udp port." int typestr="portnumber" default="1500" optional -option "jitter_compensation" j "non-zero values enable ortp's adaptive jitter compensation" int typestr="milliseconds" default="400" optional +option "jitter_compensation" j "set ortp's adaptive jitter compensation" int typestr="milliseconds" default="0" optional