#define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
/** \endcond */
-extern struct gengetopt_args_info conf;
-
/** describes one entry in the list of targets for the ortp sender */
struct ortp_target {
/** address info */
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, ORTP_AUDIO_HEADER_LEN, ot->last_ts + ot->chunk_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(long unsigned current_chunk)
{
- /* FIXME: No need to compute this on every run */
- int mod = conf.ortp_header_interval_arg / (tv2ms(&af->chunk_tv) + 1);
- if (mod && (chunks_sent % mod))
+ static struct timeval last_header;
+ struct timeval now, diff;
+
+ if (!current_chunk)
return 0;
+ gettimeofday(&now, NULL);
+ tv_diff(&now, &last_header, &diff);
+ if (tv2ms(&diff) < conf.ortp_header_interval_arg)
+ return 0;
+ last_header = now;
return 1;
}
-static void ortp_send(struct audio_format *af, long unsigned current_chunk,
- long unsigned chunks_sent, const char *buf, size_t len)
+static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
+ const char *buf, size_t len)
{
struct ortp_target *ot, *tmp;
size_t sendbuf_len;
int header_len = 0;
- int packet_type = ORTP_DATA, stream_type = af && af->get_header_info; /* header stream? */
+ int packet_type = ORTP_DATA;
char *sendbuf, *header_buf = NULL;
+ struct timeval *chunk_tv;
if (self->status != SENDER_ON)
return;
+ chunk_tv = afs_chunk_time();
+ if (!chunk_tv)
+ return;
list_for_each_entry_safe(ot, tmp, &targets, node) {
if (!ot->session) {
ortp_init_session(ot);
}
if (!ot->chunk_ts)
ot->chunk_ts = rtp_session_time_to_ts(ot->session,
- tv2ms(&af->chunk_tv));
+ tv2ms(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))
return;
- if (stream_type) {
- header_buf = af->get_header_info(&header_len);
- if (!need_extra_header(af, chunks_sent))
- header_len = 0;
- }
+ header_buf = afs_get_header(&header_len);
+ if (!need_extra_header(current_chunk))
+ header_len = 0;
sendbuf_len = ORTP_AUDIO_HEADER_LEN + header_len + len;
sendbuf = para_malloc(sendbuf_len);
if (!current_chunk)
else if (header_len)
packet_type = ORTP_HEADER;
WRITE_PACKET_TYPE(sendbuf, packet_type);
- WRITE_CHUNK_TIME(sendbuf, af->chunk_tv.tv_usec);
- WRITE_STREAM_TYPE(sendbuf, stream_type);
+ WRITE_CHUNK_TIME(sendbuf, chunk_tv->tv_usec);
+ WRITE_STREAM_TYPE(sendbuf, header_buf? 1 : 0);
WRITE_HEADER_LEN(sendbuf, header_len);
if (header_len)
memcpy(sendbuf + ORTP_AUDIO_HEADER_LEN, header_buf,
}
}
-static void ortp_pre_select(__a_unused struct audio_format *af,
- __a_unused int *max_fileno, __a_unused fd_set *rfds,
+static void ortp_pre_select(__a_unused int *max_fileno, __a_unused fd_set *rfds,
__a_unused fd_set *wfds)
{
return;