RtpSession *session;
};
-static int numtargets;
static struct list_head targets;
static struct sender *self;
rtp_session_destroy(ot->session);
ot->session = NULL;
}
- numtargets--;
list_del(&ot->node);
free(ot);
}
int ret;
list_for_each_entry_safe(ot, tmp, &targets, node) {
- struct timeval now;
int ts;
- gettimeofday(&now, NULL);
if (!ot->session)
continue;
WRITE_CHUNK_TS(buf, ot->chunk_ts);
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);
/* called by afs */
static void ortp_shutdown_targets(void)
{
- char buf[2];
+ char buf[ORTP_AUDIO_HEADER_LEN];
struct ortp_target *ot, *tmp;
- buf[0] = ORTP_EOF;
+ WRITE_PACKET_TYPE(buf, ORTP_EOF);
list_for_each_entry_safe(ot, tmp, &targets, node) {
if (!ot->session || !ot->streaming)
continue;
- PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n", TARGET_ADDR(ot), ot->port,
- ot->last_ts);
- rtp_session_send_with_ts(ot->session, buf, 1, ot->last_ts);
+ PARA_INFO_LOG("sending eof to ortp target %s:%d, ts = %d\n",
+ TARGET_ADDR(ot), ot->port, ot->last_ts);
+ rtp_session_send_with_ts(ot->session, buf,
+ ORTP_AUDIO_HEADER_LEN, ot->last_ts);
ot->streaming = 0;
ot->chunk_ts = 0;
rtp_session_reset(ot->session);
}
}
-static int need_extra_header(struct audio_format *af, long unsigned chunks_sent)
+static int need_extra_header(struct audio_format_handler *af,
+ long unsigned chunks_sent)
{
/* FIXME: No need to compute this on every run */
int mod = conf.ortp_header_interval_arg / (tv2ms(&af->chunk_tv) + 1);
return 1;
}
-static void ortp_send(struct audio_format *af, long unsigned current_chunk,
+static void ortp_send(struct audio_format_handler *af, long unsigned current_chunk,
long unsigned chunks_sent, const char *buf, size_t len)
{
struct ortp_target *ot, *tmp;
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))
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;
}
}
-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_handler *af,
+ __a_unused int *max_fileno, __a_unused fd_set *rfds,
+ __a_unused fd_set *wfds)
{
return;
}