X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/4ecbdbd99dea3236c3c6d5ea5401a08c56de5d3c..f0bd437a6f04dc8681c6d705dba04c84d297b97f:/server/speaker-network.c?ds=inline
diff --git a/server/speaker-network.c b/server/speaker-network.c
index 40abca5..e8a7190 100644
--- a/server/speaker-network.c
+++ b/server/speaker-network.c
@@ -1,27 +1,24 @@
/*
* This file is part of DisOrder
- * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2005-2008 Richard Kettlewell
*
- * This program is free software; you can redistribute it and/or modify
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program. If not, see .
*/
/** @file server/speaker-network.c
* @brief Support for @ref BACKEND_NETWORK */
-#include
-#include "types.h"
+#include "common.h"
#include
#include
@@ -29,10 +26,10 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include "configuration.h"
#include "syscalls.h"
@@ -83,24 +80,16 @@ static int audio_errors;
static void network_init(void) {
struct addrinfo *res, *sres;
static const struct addrinfo pref = {
- 0,
- PF_INET,
- SOCK_DGRAM,
- IPPROTO_UDP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = 0,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = IPPROTO_UDP,
};
static const struct addrinfo prefbind = {
- AI_PASSIVE,
- PF_INET,
- SOCK_DGRAM,
- IPPROTO_UDP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = AI_PASSIVE,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = IPPROTO_UDP,
};
static const int one = 1;
int sndbuf, target_sndbuf = 131072;
@@ -125,6 +114,9 @@ static void network_init(void) {
const int mttl = config->multicast_ttl;
if(setsockopt(bfd, IPPROTO_IP, IP_MULTICAST_TTL, &mttl, sizeof mttl) < 0)
fatal(errno, "error setting IP_MULTICAST_TTL on multicast socket");
+ if(setsockopt(bfd, IPPROTO_IP, IP_MULTICAST_LOOP,
+ &config->multicast_loop, sizeof one) < 0)
+ fatal(errno, "error setting IP_MULTICAST_LOOP on multicast socket");
break;
}
case PF_INET6: {
@@ -132,6 +124,9 @@ static void network_init(void) {
if(setsockopt(bfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
&mttl, sizeof mttl) < 0)
fatal(errno, "error setting IPV6_MULTICAST_HOPS on multicast socket");
+ if(setsockopt(bfd, IPPROTO_IP, IPV6_MULTICAST_LOOP,
+ &config->multicast_loop, sizeof (int)) < 0)
+ fatal(errno, "error setting IPV6_MULTICAST_LOOP on multicast socket");
break;
}
default:
@@ -193,6 +188,9 @@ static size_t network_play(size_t frames) {
/* We transmit using RTP (RFC3550) and attempt to conform to the internet
* AVT profile (RFC3551). */
+ /* If we're starting then initialize the base time */
+ if(!rtp_time)
+ xgettimeofday(&rtp_time_0, 0);
if(idled) {
/* There may have been a gap. Fix up the RTP time accordingly. */
struct timeval now;
@@ -203,7 +201,12 @@ static size_t network_play(size_t frames) {
xgettimeofday(&now, 0);
/* Find the number of microseconds elapsed since rtp_time=0 */
delta = tvsub_us(now, rtp_time_0);
- assert(delta <= UINT64_MAX / 88200);
+ if(delta > UINT64_MAX / 88200)
+ fatal(0, "rtp_time=%"PRIu64" now=%ld.%06ld rtp_time_0=%ld.%06ld delta=%"PRIu64" (%"PRId64")",
+ rtp_time,
+ (long)now.tv_sec, (long)now.tv_usec,
+ (long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
+ delta, delta);
target_rtp_time = (delta * config->sample_format.rate
* config->sample_format.channels) / 1000000;
/* Overflows at ~6 years uptime with 44100Hz stereo */
@@ -213,24 +216,16 @@ static size_t network_play(size_t frames) {
* the value we deduce from time comparison.
*
* Suppose we have 1s track started at t=0, and another track begins to
- * play at t=2s. Suppose RTP_AHEAD_MS=1000 and 44100Hz stereo. In that
- * case we'll send 1s of audio as fast as we can, giving rtp_time=88200.
- * rtp_time stops at this point.
+ * play at t=2s. Suppose 44100Hz stereo. We send 1s of audio over the
+ * next (about) one second, giving rtp_time=88200. rtp_time stops at this
+ * point.
*
* At t=2s we'll have calculated target_rtp_time=176400. In this case we
* set rtp_time=176400 and the player can correctly conclude that it
* should leave 1s between the tracks.
*
- * Suppose instead that the second track arrives at t=0.5s, and that
- * we've managed to transmit the whole of the first track already. We'll
- * have target_rtp_time=44100.
- *
- * The desired behaviour is to play the second track back to back with
- * first. In this case therefore we do not modify rtp_time.
- *
- * Is it ever right to reduce rtp_time? No; for that would imply
- * transmitting packets with overlapping timestamp ranges, which does not
- * make sense.
+ * It's never right to reduce rtp_time, for that would imply packets with
+ * overlapping timestamp ranges, which does not make sense.
*/
target_rtp_time &= ~(uint64_t)1; /* stereo! */
if(target_rtp_time > rtp_time) {
@@ -240,15 +235,8 @@ static size_t network_play(size_t frames) {
target_rtp_time - rtp_time);
rtp_time = target_rtp_time;
} else if(target_rtp_time < rtp_time) {
- const int64_t samples_ahead = ((uint64_t)RTP_AHEAD_MS
- * config->sample_format.rate
- * config->sample_format.channels
- / 1000);
-
- if(target_rtp_time + samples_ahead < rtp_time) {
- info("reversing rtp_time by %"PRIu64" samples",
- rtp_time - target_rtp_time);
- }
+ info("would reverse rtp_time by %"PRIu64" samples",
+ rtp_time - target_rtp_time);
}
}
header.vpxcc = 2 << 6; /* V=2, P=0, X=0, CC=0 */
@@ -305,30 +293,32 @@ static void network_beforepoll(int *timeoutp) {
uint64_t target_rtp_time;
const int64_t samples_per_second = config->sample_format.rate
* config->sample_format.channels;
- const int64_t samples_ahead = ((uint64_t)RTP_AHEAD_MS
- * samples_per_second
- / 1000);
int64_t lead, ahead_ms;
/* If we're starting then initialize the base time */
if(!rtp_time)
xgettimeofday(&rtp_time_0, 0);
- /* We send audio data whenever we get RTP_AHEAD seconds or more
- * behind */
+ /* We send audio data whenever we would otherwise get behind */
xgettimeofday(&now, 0);
target_us = tvsub_us(now, rtp_time_0);
- assert(target_us <= UINT64_MAX / 88200);
+ if(target_us > UINT64_MAX / 88200)
+ fatal(0, "rtp_time=%"PRIu64" rtp_time_0=%ld.%06ld now=%ld.%06ld target_us=%"PRIu64" (%"PRId64")\n",
+ rtp_time,
+ (long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
+ (long)now.tv_sec, (long)now.tv_usec,
+ target_us, target_us);
target_rtp_time = (target_us * config->sample_format.rate
* config->sample_format.channels)
/ 1000000;
+ /* Lead is how far ahead we are */
lead = rtp_time - target_rtp_time;
- if(lead < samples_ahead)
- /* We've not reached the desired lead, write as fast as we can */
+ if(lead <= 0)
+ /* We're behind or even, so we'll need to write as soon as we can */
bfd_slot = addfd(bfd, POLLOUT);
else {
- /* We've reached the desired lead, we can afford to wait a bit even if the
- * IP stack thinks it can accept more. */
- ahead_ms = 1000 * (lead - samples_ahead) / samples_per_second;
+ /* We've ahead, we can afford to wait a bit even if the IP stack thinks it
+ * can accept more. */
+ ahead_ms = 1000 * lead / samples_per_second;
if(ahead_ms < *timeoutp)
*timeoutp = ahead_ms;
}