X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=07e3cccfbc65423bcd0455d1b9eb5617fbbe1c91;hp=fbd4077e828e7e945fc8c0c4497e56f0dcacffa8;hb=5d506faba5e49d3fc7eecb5b7d80b515241871d4;hpb=044dd6b25189b24d862d50b965fc2feaf93b01d7

diff --git a/ortp_send.c b/ortp_send.c
index fbd4077e..07e3cccf 100644
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -54,7 +54,6 @@ struct ortp_target {
 	RtpSession *session;
 };
 
-static int numtargets;
 static struct list_head targets;
 static struct sender *self;
 
@@ -66,7 +65,6 @@ static void ortp_delete_target(struct ortp_target *ot, const char *msg)
 		rtp_session_destroy(ot->session);
 		ot->session = NULL;
 	}
-	numtargets--;
 	list_del(&ot->node);
 	free(ot);
 }
@@ -103,7 +101,11 @@ static void ortp_init_session(struct ortp_target *ot)
 	if (!ot->session)
 		return;
 	s = ot->session;
-//	rtp_session_set_jitter_compensation(ot->session, 100);
+	if (conf.ortp_jitter_compensation_arg) {
+		rtp_session_enable_adaptive_jitter_compensation(ot->session, TRUE);
+		rtp_session_set_jitter_compensation(ot->session,
+			conf.ortp_jitter_compensation_arg);
+	}
 	/* always successful */
 	rtp_session_set_send_payload_type(s, PAYLOAD_AUDIO_CONTINUOUS);
 	ret = rtp_session_set_remote_addr(s, TARGET_ADDR(ot), ot->port);
@@ -159,8 +161,10 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk,
 				continue;
 		}
 		if (!ot->chunk_ts)
-			ot->chunk_ts = rtp_session_time_to_ts(ot->session, tv2ms(&af->chunk_tv));
-//		PARA_DEBUG_LOG("len: %d, af: %p, ts: %d\n", len, af, ot->chunk_ts);
+			ot->chunk_ts = rtp_session_time_to_ts(ot->session,
+				tv2ms(&af->chunk_tv));
+//		PARA_DEBUG_LOG("len: %d, ts: %lu, ts: %d\n",
+//			len, ot->chunk_ts * chunks_sent, ot->chunk_ts);
 		ot->streaming = 1;
 	}
 	if (list_empty(&targets))
@@ -188,14 +192,14 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk,
 	free(sendbuf);
 }
 
-static int ortp_com_on(struct sender_command_data *scd)
+static int ortp_com_on(__a_unused struct sender_command_data *scd)
 {
 
 	self->status = SENDER_ON;
 	return 1;
 }
 
-static int ortp_com_off(struct sender_command_data *scd)
+static int ortp_com_off(__a_unused struct sender_command_data *scd)
 {
 	ortp_shutdown_targets();
 	self->status = SENDER_OFF;
@@ -286,8 +290,9 @@ success:
 	}
 }
 
-static void ortp_pre_select(struct audio_format *af, int *max_fileno,
-		fd_set *rfds, fd_set *wfds)
+static void ortp_pre_select(__a_unused struct audio_format *af,
+	__a_unused  int *max_fileno, __a_unused fd_set *rfds,
+	__a_unused fd_set *wfds)
 {
 	return;
 }