X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=65c68418bc7cba6f9d6f327d6b95195dfb2f8c74;hp=da590dcdcaf251800feca76546e873bd1fddd999;hb=5b30367a7e47fe5b9014599586e819305d76c9b0;hpb=9230155e692c3a2303a267759183dd1ad264dda1 diff --git a/ortp_send.c b/ortp_send.c index da590dcd..65c68418 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,10 +19,11 @@ /** \file ortp_send.c para_server's ortp sender */ #include +#include #include "server.cmdline.h" #include "server.h" -#include "afs.h" +#include "vss.h" #include "send.h" #include "list.h" #include "ortp.h" @@ -32,8 +33,6 @@ #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 */ @@ -41,9 +40,9 @@ struct ortp_target { /** whether the ortp sender is activated */ int status; /** the ortp timestamp increases by this amount */ - int chunk_ts; + uint32_t chunk_ts; /** the currently used timestamp for this target */ - int last_ts; + uint32_t last_ts; /** the position of this target in the list of targets */ struct list_head node; /** the UDP port */ @@ -69,26 +68,43 @@ static void ortp_delete_target(struct ortp_target *ot, const char *msg) free(ot); } -static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent) +static void ortp_send_buf(char *buf, size_t len, long unsigned chunks_sent) { struct ortp_target *ot, *tmp; - int ret; + int ret, ortp_len = len; /* rtp_session_send_with_ts expects int */ + if (ortp_len < 0) + return; list_for_each_entry_safe(ot, tmp, &targets, node) { - int ts; + uint32_t ts; if (!ot->session) continue; WRITE_CHUNK_TS(buf, ot->chunk_ts); ts = ot->chunk_ts * chunks_sent; - ret = rtp_session_send_with_ts(ot->session, buf, len, ts); + ret = rtp_session_send_with_ts(ot->session, + (unsigned char*)buf, ortp_len, ts); ot->last_ts = ts; if (ret < 0) ortp_delete_target(ot, "send error"); - if (ret != len +12) + if (ret != len + 12) PARA_NOTICE_LOG("short write %d\n", ret); } } +static int set_multicast(RtpSession *s) +{ + unsigned char loop = 1; + int ret; + + ret = setsockopt(s->rtp.socket, + IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop)); + if (ret < 0) { + PARA_ERROR_LOG("IP_MULTICAST_LOOP error %d\n", ret); + + } + return 1; +} + static void ortp_init_session(struct ortp_target *ot) { RtpSession *s; @@ -110,48 +126,61 @@ static void ortp_init_session(struct ortp_target *ot) if (ret < 0) { rtp_session_destroy(ot->session); ot->session = NULL; + return; } + set_multicast(s); } -/* called by afs */ +/* called by vss */ static void ortp_shutdown_targets(void) { - char buf[ORTP_AUDIO_HEADER_LEN]; + unsigned char buf[ORTP_AUDIO_HEADER_LEN]; struct ortp_target *ot, *tmp; 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, 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? */ + size_t header_len = 0; + int packet_type = ORTP_DATA; char *sendbuf, *header_buf = NULL; + struct timeval *chunk_tv; if (self->status != SENDER_ON) return; + chunk_tv = vss_chunk_time(); + if (!chunk_tv) + return; list_for_each_entry_safe(ot, tmp, &targets, node) { if (!ot->session) { ortp_init_session(ot); @@ -160,18 +189,16 @@ static void ortp_send(struct audio_format *af, long unsigned current_chunk, } if (!ot->chunk_ts) ot->chunk_ts = rtp_session_time_to_ts(ot->session, - tv2ms(&af->chunk_tv)); + (int)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 = vss_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) @@ -179,8 +206,8 @@ static void ortp_send(struct audio_format *af, long unsigned 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, @@ -225,7 +252,7 @@ static void ortp_add_target(int port, struct in_addr *addr) ot->addr = *addr; PARA_INFO_LOG("adding to target list (%s:%d)\n", TARGET_ADDR(ot), ot->port); - list_add(&ot->node, &targets); + para_list_add(&ot->node, &targets); } static int ortp_com_add(struct sender_command_data *scd) @@ -288,8 +315,7 @@ success: } } -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;