/*
* This file is part of DisOrder.
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
*
* 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
/** @file clients/playrtp.c
* @brief RTP player
*
- * This RTP player supports Linux (ALSA) and Darwin (Core Audio) systems.
+ * This player supports Linux (<a href="http://www.alsa-project.org/">ALSA</a>)
+ * and Apple Mac (<a
+ * href="http://developer.apple.com/audio/coreaudio.html">Core Audio</a>)
+ * systems. There is no support for Microsoft Windows yet, and that will in
+ * fact probably an entirely separate program.
+ *
+ * The program runs (at least) three threads. listen_thread() is responsible
+ * for reading RTP packets off the wire and adding them to the linked list @ref
+ * received_packets, assuming they are basically sound. queue_thread() takes
+ * packets off this linked list and adds them to @ref packets (an operation
+ * which might be much slower due to contention for @ref lock).
+ *
+ * The main thread is responsible for actually playing audio. In ALSA this
+ * means it waits until ALSA says it's ready for more audio which it then
+ * plays. See @ref clients/playrtp-alsa.c.
+ *
+ * In Core Audio the main thread is only responsible for starting and stopping
+ * play: the system does the actual playback in its own private thread, and
+ * calls adioproc() to fetch the audio data. See @ref
+ * clients/playrtp-coreaudio.c.
+ *
+ * Sometimes it happens that there is no audio available to play. This may
+ * because the server went away, or a packet was dropped, or the server
+ * deliberately did not send any sound because it encountered a silence.
+ *
+ * Assumptions:
+ * - it is safe to read uint32_t values without a lock protecting them
*/
#include <config.h>
#include <locale.h>
#include <sys/uio.h>
#include <string.h>
+#include <assert.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <fcntl.h>
#include "log.h"
#include "mem.h"
#include "defs.h"
#include "vector.h"
#include "heap.h"
-
-#if HAVE_COREAUDIO_AUDIOHARDWARE_H
-# include <CoreAudio/AudioHardware.h>
-#endif
-#if API_ALSA
-#include <alsa/asoundlib.h>
-#endif
+#include "timeval.h"
+#include "client.h"
+#include "playrtp.h"
+#include "inputline.h"
+#include "version.h"
#define readahead linux_headers_are_borked
+/** @brief Obsolete synonym */
+#ifndef IPV6_JOIN_GROUP
+# define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
+#endif
+
/** @brief RTP socket */
static int rtpfd;
static FILE *logfp;
/** @brief Output device */
-static const char *device;
-
-/** @brief Maximum samples per packet we'll support
- *
- * NB that two channels = two samples in this program.
- */
-#define MAXSAMPLES 2048
+const char *device;
/** @brief Minimum low watermark
*
* We'll stop playing if there's only this many samples in the buffer. */
-static unsigned minbuffer = 2 * 44100 / 10; /* 0.2 seconds */
-
-/** @brief Maximum sample size
- *
- * The maximum supported size (in bytes) of one sample. */
-#define MAXSAMPLESIZE 2
+unsigned minbuffer = 2 * 44100 / 10; /* 0.2 seconds */
/** @brief Buffer high watermark
*
* We'll stop reading from the network if we have this many samples. */
static unsigned maxbuffer;
-/** @brief Number of samples to infill by in one go
+/** @brief Received packets
+ * Protected by @ref receive_lock
*
- * This is an upper bound - in practice we expect the underlying audio API to
- * only ask for a much smaller number of samples in any one go.
+ * Received packets are added to this list, and queue_thread() picks them off
+ * it and adds them to @ref packets. Whenever a packet is added to it, @ref
+ * receive_cond is signalled.
*/
-#define INFILL_SAMPLES (44100 * 2) /* 1s */
+struct packet *received_packets;
-/** @brief Received packet
- *
- * Received packets are kept in a binary heap (see @ref pheap) ordered by
- * timestamp.
+/** @brief Tail of @ref received_packets
+ * Protected by @ref receive_lock
*/
-struct packet {
- /** @brief Number of samples in this packet */
- uint32_t nsamples;
-
- /** @brief Timestamp from RTP packet
- *
- * NB that "timestamps" are really sample counters. Use lt() or lt_packet()
- * to compare timestamps.
- */
- uint32_t timestamp;
-
- /** @brief Flags
- *
- * Valid values are:
- * - @ref IDLE: the idle bit was set in the RTP packet
- */
- unsigned flags;
-#define IDLE 0x0001 /**< idle bit set in RTP packet */
-
- /** @brief Raw sample data
- *
- * Only the first @p nsamples samples are defined; the rest is uninitialized
- * data.
- */
- unsigned char samples_raw[MAXSAMPLES * MAXSAMPLESIZE];
-};
+struct packet **received_tail = &received_packets;
-/** @brief Return true iff \f$a < b\f$ in sequence-space arithmetic
+/** @brief Lock protecting @ref received_packets
*
- * Specifically it returns true if \f$(a-b) mod 2^{32} < 2^{31}\f$.
- *
- * See also lt_packet().
- */
-static inline int lt(uint32_t a, uint32_t b) {
- return (uint32_t)(a - b) & 0x80000000;
-}
-
-/** @brief Return true iff a >= b in sequence-space arithmetic */
-static inline int ge(uint32_t a, uint32_t b) {
- return !lt(a, b);
-}
+ * Only listen_thread() and queue_thread() ever hold this lock. It is vital
+ * that queue_thread() not hold it any longer than it strictly has to. */
+pthread_mutex_t receive_lock = PTHREAD_MUTEX_INITIALIZER;
-/** @brief Return true iff a > b in sequence-space arithmetic */
-static inline int gt(uint32_t a, uint32_t b) {
- return lt(b, a);
-}
-
-/** @brief Return true iff a <= b in sequence-space arithmetic */
-static inline int le(uint32_t a, uint32_t b) {
- return !lt(b, a);
-}
-
-/** @brief Ordering for packets, used by @ref pheap */
-static inline int lt_packet(const struct packet *a, const struct packet *b) {
- return lt(a->timestamp, b->timestamp);
-}
+/** @brief Condition variable signalled when @ref received_packets is updated
+ *
+ * Used by listen_thread() to notify queue_thread() that it has added another
+ * packet to @ref received_packets. */
+pthread_cond_t receive_cond = PTHREAD_COND_INITIALIZER;
-/** @struct pheap
- * @brief Binary heap of packets ordered by timestamp */
-HEAP_TYPE(pheap, struct packet *, lt_packet);
+/** @brief Length of @ref received_packets */
+uint32_t nreceived;
/** @brief Binary heap of received packets */
-static struct pheap packets;
+struct pheap packets;
-/** @brief Total number of samples available */
-static unsigned long nsamples;
+/** @brief Total number of samples available
+ *
+ * We make this volatile because we inspect it without a protecting lock,
+ * so the usual pthread_* guarantees aren't available.
+ */
+volatile uint32_t nsamples;
/** @brief Timestamp of next packet to play.
*
* This is set to the timestamp of the last packet, plus the number of
* samples it contained. Only valid if @ref active is nonzero.
*/
-static uint32_t next_timestamp;
+uint32_t next_timestamp;
/** @brief True if actively playing
*
* This is true when playing and false when just buffering. */
-static int active;
+int active;
-/** @brief Structure of free packet list */
-union free_packet {
- struct packet p;
- union free_packet *next;
-};
+/** @brief Lock protecting @ref packets */
+pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-/** @brief Linked list of free packets
- *
- * This is a linked list of formerly used packets. For preference we re-use
- * packets that have already been used rather than unused ones, to limit the
- * size of the program's working set. If there are no free packets in the list
- * we try @ref next_free_packet instead.
- *
- * Must hold @ref lock when accessing this.
- */
-static union free_packet *free_packets;
+/** @brief Condition variable signalled whenever @ref packets is changed */
+pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-/** @brief Array of new free packets
+#if HAVE_ALSA_ASOUNDLIB_H
+# define DEFAULT_BACKEND playrtp_alsa
+#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+# define DEFAULT_BACKEND playrtp_oss
+#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
+# define DEFAULT_BACKEND playrtp_coreaudio
+#else
+# error No known backend
+#endif
+
+/** @brief Backend to play with */
+static void (*backend)(void) = &DEFAULT_BACKEND;
+
+HEAP_DEFINE(pheap, struct packet *, lt_packet);
+
+/** @brief Control socket or NULL */
+const char *control_socket;
+
+/** @brief Buffer for debugging dump
*
- * There are @ref count_free_packets ready to use at this address. If there
- * are none left we allocate more memory.
+ * The debug dump is enabled by the @c --dump option. It records the last 20s
+ * of audio to the specified file (which will be about 3.5Mbytes). The file is
+ * written as as ring buffer, so the start point will progress through it.
*
- * Must hold @ref lock when accessing this.
- */
-static union free_packet *next_free_packet;
-
-/** @brief Count of new free packets at @ref next_free_packet
+ * Use clients/dump2wav to convert this to a WAV file, which can then be loaded
+ * into (e.g.) Audacity for further inspection.
+ *
+ * All three backends (ALSA, OSS, Core Audio) now support this option.
*
- * Must hold @ref lock when accessing this.
+ * The idea is to allow the user a few seconds to react to an audible artefact.
*/
-static size_t count_free_packets;
+int16_t *dump_buffer;
-/** @brief Lock protecting @ref packets
- *
- * This also protects the packet memory allocation infrastructure, @ref
- * free_packets and @ref next_free_packet. */
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+/** @brief Current index within debugging dump */
+size_t dump_index;
-/** @brief Condition variable signalled whenever @ref packets is changed */
-static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+/** @brief Size of debugging dump in samples */
+size_t dump_size = 44100/*Hz*/ * 2/*channels*/ * 20/*seconds*/;
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
{ "min", required_argument, 0, 'm' },
{ "max", required_argument, 0, 'x' },
{ "buffer", required_argument, 0, 'b' },
+ { "rcvbuf", required_argument, 0, 'R' },
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+ { "oss", no_argument, 0, 'o' },
+#endif
+#if HAVE_ALSA_ASOUNDLIB_H
+ { "alsa", no_argument, 0, 'a' },
+#endif
+#if HAVE_COREAUDIO_AUDIOHARDWARE_H
+ { "core-audio", no_argument, 0, 'c' },
+#endif
+ { "dump", required_argument, 0, 'r' },
+ { "socket", required_argument, 0, 's' },
+ { "config", required_argument, 0, 'C' },
{ 0, 0, 0, 0 }
};
-/** @brief Return a new packet
+/** @brief Control thread
*
- * Assumes that @ref lock is held. */
-static struct packet *new_packet(void) {
- struct packet *p;
-
- if(free_packets) {
- p = &free_packets->p;
- free_packets = free_packets->next;
- } else {
- if(!count_free_packets) {
- next_free_packet = xcalloc(1024, sizeof (union free_packet));
- count_free_packets = 1024;
+ * This thread is responsible for accepting control commands from Disobedience
+ * (or other controllers) over an AF_UNIX stream socket with a path specified
+ * by the @c --socket option. The protocol uses simple string commands and
+ * replies:
+ *
+ * - @c stop will shut the player down
+ * - @c query will send back the reply @c running
+ * - anything else is ignored
+ *
+ * Commands and response strings terminated by shutting down the connection or
+ * by a newline. No attempt is made to multiplex multiple clients so it is
+ * important that the command be sent as soon as the connection is made - it is
+ * assumed that both parties to the protocol are entirely cooperating with one
+ * another.
+ */
+static void *control_thread(void attribute((unused)) *arg) {
+ struct sockaddr_un sa;
+ int sfd, cfd;
+ char *line;
+ socklen_t salen;
+ FILE *fp;
+
+ assert(control_socket);
+ unlink(control_socket);
+ memset(&sa, 0, sizeof sa);
+ sa.sun_family = AF_UNIX;
+ strcpy(sa.sun_path, control_socket);
+ sfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
+ if(bind(sfd, (const struct sockaddr *)&sa, sizeof sa) < 0)
+ fatal(errno, "error binding to %s", control_socket);
+ if(listen(sfd, 128) < 0)
+ fatal(errno, "error calling listen on %s", control_socket);
+ info("listening on %s", control_socket);
+ for(;;) {
+ salen = sizeof sa;
+ cfd = accept(sfd, (struct sockaddr *)&sa, &salen);
+ if(cfd < 0) {
+ switch(errno) {
+ case EINTR:
+ case EAGAIN:
+ break;
+ default:
+ fatal(errno, "error calling accept on %s", control_socket);
+ }
+ }
+ if(!(fp = fdopen(cfd, "r+"))) {
+ error(errno, "error calling fdopen for %s connection", control_socket);
+ close(cfd);
+ continue;
+ }
+ if(!inputline(control_socket, fp, &line, '\n')) {
+ if(!strcmp(line, "stop")) {
+ info("stopped via %s", control_socket);
+ exit(0); /* terminate immediately */
+ }
+ if(!strcmp(line, "query"))
+ fprintf(fp, "running");
+ xfree(line);
}
- p = &(next_free_packet++)->p;
- --count_free_packets;
+ if(fclose(fp) < 0)
+ error(errno, "error closing %s connection", control_socket);
}
- return p;
-}
-
-/** @brief Free a packet
- *
- * Assumes that @ref lock is held. */
-static void free_packet(struct packet *p) {
- union free_packet *u = (union free_packet *)p;
- u->next = free_packets;
- free_packets = u;
}
/** @brief Drop the first packet
if(pheap_count(&packets)) {
struct packet *const p = pheap_remove(&packets);
nsamples -= p->nsamples;
- free_packet(p);
+ playrtp_free_packet(p);
pthread_cond_broadcast(&cond);
}
}
+/** @brief Background thread adding packets to heap
+ *
+ * This just transfers packets from @ref received_packets to @ref packets. It
+ * is important that it holds @ref receive_lock for as little time as possible,
+ * in order to minimize the interval between calls to read() in
+ * listen_thread().
+ */
+static void *queue_thread(void attribute((unused)) *arg) {
+ struct packet *p;
+
+ for(;;) {
+ /* Get the next packet */
+ pthread_mutex_lock(&receive_lock);
+ while(!received_packets) {
+ pthread_cond_wait(&receive_cond, &receive_lock);
+ }
+ p = received_packets;
+ received_packets = p->next;
+ if(!received_packets)
+ received_tail = &received_packets;
+ --nreceived;
+ pthread_mutex_unlock(&receive_lock);
+ /* Add it to the heap */
+ pthread_mutex_lock(&lock);
+ pheap_insert(&packets, p);
+ nsamples += p->nsamples;
+ pthread_cond_broadcast(&cond);
+ pthread_mutex_unlock(&lock);
+ }
+}
+
/** @brief Background thread collecting samples
*
* This function collects samples, perhaps converts them to the target format,
- * and adds them to the packet list. */
+ * and adds them to the packet list.
+ *
+ * It is crucial that the gap between successive calls to read() is as small as
+ * possible: otherwise packets will be dropped.
+ *
+ * We use a binary heap to ensure that the unavoidable effort is at worst
+ * logarithmic in the total number of packets - in fact if packets are mostly
+ * received in order then we will largely do constant work per packet since the
+ * newest packet will always be last.
+ *
+ * Of more concern is that we must acquire the lock on the heap to add a packet
+ * to it. If this proves a problem in practice then the answer would be
+ * (probably doubly) linked list with new packets added the end and a second
+ * thread which reads packets off the list and adds them to the heap.
+ *
+ * We keep memory allocation (mostly) very fast by keeping pre-allocated
+ * packets around; see @ref playrtp_new_packet().
+ */
static void *listen_thread(void attribute((unused)) *arg) {
struct packet *p = 0;
int n;
struct iovec iov[2];
for(;;) {
- if(!p) {
- pthread_mutex_lock(&lock);
- p = new_packet();
- pthread_mutex_unlock(&lock);
- }
+ if(!p)
+ p = playrtp_new_packet();
iov[0].iov_base = &header;
iov[0].iov_len = sizeof header;
iov[1].iov_base = p->samples_raw;
- iov[1].iov_len = sizeof p->samples_raw;
+ iov[1].iov_len = sizeof p->samples_raw / sizeof *p->samples_raw;
n = readv(rtpfd, iov, 2);
if(n < 0) {
switch(errno) {
timestamp, next_timestamp);
continue;
}
- pthread_mutex_lock(&lock);
+ p->next = 0;
p->flags = 0;
p->timestamp = timestamp;
/* Convert to target format */
switch(header.mpt & 0x7F) {
case 10:
p->nsamples = (n - sizeof header) / sizeof(uint16_t);
- /* ALSA can do any necessary conversion itself (though it might be better
- * to do any necessary conversion in the background) */
- /* TODO we could readv into the buffer */
break;
/* TODO support other RFC3551 media types (when the speaker does) */
default:
* This is rather unsatisfactory: it means that if packets get heavily
* out of order then we guarantee dropouts. But for now... */
if(nsamples >= maxbuffer) {
- info("buffer full");
- while(nsamples >= maxbuffer)
+ pthread_mutex_lock(&lock);
+ while(nsamples >= maxbuffer) {
pthread_cond_wait(&cond, &lock);
+ }
+ pthread_mutex_unlock(&lock);
}
- /* Add the packet to the heap */
- pheap_insert(&packets, p);
- nsamples += p->nsamples;
+ /* Add the packet to the receive queue */
+ pthread_mutex_lock(&receive_lock);
+ *received_tail = p;
+ received_tail = &p->next;
+ ++nreceived;
+ pthread_cond_signal(&receive_cond);
+ pthread_mutex_unlock(&receive_lock);
/* We'll need a new packet */
p = 0;
- pthread_cond_broadcast(&cond);
- pthread_mutex_unlock(&lock);
}
}
-/** @brief Return true if @p p contains @p timestamp */
-static inline int contains(const struct packet *p, uint32_t timestamp) {
- const uint32_t packet_start = p->timestamp;
- const uint32_t packet_end = p->timestamp + p->nsamples;
-
- return (ge(timestamp, packet_start)
- && lt(timestamp, packet_end));
+/** @brief Wait until the buffer is adequately full
+ *
+ * Must be called with @ref lock held.
+ */
+void playrtp_fill_buffer(void) {
+ while(nsamples)
+ drop_first_packet();
+ info("Buffering...");
+ while(nsamples < readahead) {
+ pthread_cond_wait(&cond, &lock);
+ }
+ next_timestamp = pheap_first(&packets)->timestamp;
+ active = 1;
}
-#if HAVE_COREAUDIO_AUDIOHARDWARE_H
-/** @brief Callback from Core Audio */
-static OSStatus adioproc
- (AudioDeviceID attribute((unused)) inDevice,
- const AudioTimeStamp attribute((unused)) *inNow,
- const AudioBufferList attribute((unused)) *inInputData,
- const AudioTimeStamp attribute((unused)) *inInputTime,
- AudioBufferList *outOutputData,
- const AudioTimeStamp attribute((unused)) *inOutputTime,
- void attribute((unused)) *inClientData) {
- UInt32 nbuffers = outOutputData->mNumberBuffers;
- AudioBuffer *ab = outOutputData->mBuffers;
- const struct packet *p;
- uint32_t samples_available;
- struct timeval in, out;
-
- gettimeofday(&in, 0);
- pthread_mutex_lock(&lock);
- while(nbuffers > 0) {
- float *samplesOut = ab->mData;
- size_t samplesOutLeft = ab->mDataByteSize / sizeof (float);
-
- while(samplesOutLeft > 0) {
- /* Look for a suitable packet, dropping any unsuitable ones along the
- * way. Unsuitable packets are ones that are in the past. */
- while(pheap_count(&packets)) {
- p = pheap_first(&packets);
- if(le(p->timestamp + p->nsamples, next_timestamp))
- /* This packet is in the past. Drop it and try another one. */
- drop_first_packet();
- else
- /* This packet is NOT in the past. (It might be in the future
- * however.) */
- break;
- }
- p = pheap_count(&packets) ? pheap_first(&packets) : 0;
- if(p && contains(p, next_timestamp)) {
- if(p->flags & IDLE)
- fprintf(stderr, "\nIDLE\n");
- /* This packet is ready to play */
- const uint32_t packet_end = p->timestamp + p->nsamples;
- const uint32_t offset = next_timestamp - p->timestamp;
- const uint16_t *ptr =
- (void *)(p->samples_raw + offset * sizeof (uint16_t));
-
- samples_available = packet_end - next_timestamp;
- if(samples_available > samplesOutLeft)
- samples_available = samplesOutLeft;
- next_timestamp += samples_available;
- samplesOutLeft -= samples_available;
- while(samples_available-- > 0)
- *samplesOut++ = (int16_t)ntohs(*ptr++) * (0.5 / 32767);
- /* We don't bother junking the packet - that'll be dealt with next time
- * round */
- write(2, ".", 1);
- } else {
- /* No packet is ready to play (and there might be no packet at all) */
- samples_available = p ? p->timestamp - next_timestamp
- : samplesOutLeft;
- if(samples_available > samplesOutLeft)
- samples_available = samplesOutLeft;
- //info("infill by %"PRIu32, samples_available);
- /* Conveniently the buffer is 0 to start with */
- next_timestamp += samples_available;
- samplesOut += samples_available;
- samplesOutLeft -= samples_available;
- write(2, "?", 1);
- }
- }
- ++ab;
- --nbuffers;
- }
- pthread_mutex_unlock(&lock);
- gettimeofday(&out, 0);
- {
- static double max;
- double thistime = (out.tv_sec - in.tv_sec) + (out.tv_usec - in.tv_usec) / 1000000.0;
- if(thistime > max)
- fprintf(stderr, "adioproc: %8.8fs\n", max = thistime);
+/** @brief Find next packet
+ * @return Packet to play or NULL if none found
+ *
+ * The return packet is merely guaranteed not to be in the past: it might be
+ * the first packet in the future rather than one that is actually suitable to
+ * play.
+ *
+ * Must be called with @ref lock held.
+ */
+struct packet *playrtp_next_packet(void) {
+ while(pheap_count(&packets)) {
+ struct packet *const p = pheap_first(&packets);
+ if(le(p->timestamp + p->nsamples, next_timestamp)) {
+ /* This packet is in the past. Drop it and try another one. */
+ drop_first_packet();
+ } else
+ /* This packet is NOT in the past. (It might be in the future
+ * however.) */
+ return p;
}
return 0;
}
-#endif
/** @brief Play an RTP stream
*
*/
static void play_rtp(void) {
pthread_t ltid;
+ int err;
/* We receive and convert audio data in a background thread */
- pthread_create(<id, 0, listen_thread, 0);
-#if API_ALSA
- {
- snd_pcm_t *pcm;
- snd_pcm_hw_params_t *hwparams;
- snd_pcm_sw_params_t *swparams;
- /* Only support one format for now */
- const int sample_format = SND_PCM_FORMAT_S16_BE;
- unsigned rate = 44100;
- const int channels = 2;
- const int samplesize = channels * sizeof(uint16_t);
- snd_pcm_uframes_t pcm_bufsize = MAXSAMPLES * samplesize * 3;
- /* If we can write more than this many samples we'll get a wakeup */
- const int avail_min = 256;
- snd_pcm_sframes_t frames_written;
- size_t samples_written;
- int prepared = 1;
- int err;
- int infilling = 0, escape = 0;
- time_t logged, now;
- uint32_t packet_start, packet_end;
-
- /* Open ALSA */
- if((err = snd_pcm_open(&pcm,
- device ? device : "default",
- SND_PCM_STREAM_PLAYBACK,
- SND_PCM_NONBLOCK)))
- fatal(0, "error from snd_pcm_open: %d", err);
- /* Set up 'hardware' parameters */
- snd_pcm_hw_params_alloca(&hwparams);
- if((err = snd_pcm_hw_params_any(pcm, hwparams)) < 0)
- fatal(0, "error from snd_pcm_hw_params_any: %d", err);
- if((err = snd_pcm_hw_params_set_access(pcm, hwparams,
- SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
- fatal(0, "error from snd_pcm_hw_params_set_access: %d", err);
- if((err = snd_pcm_hw_params_set_format(pcm, hwparams,
- sample_format)) < 0)
-
- fatal(0, "error from snd_pcm_hw_params_set_format (%d): %d",
- sample_format, err);
- if((err = snd_pcm_hw_params_set_rate_near(pcm, hwparams, &rate, 0)) < 0)
- fatal(0, "error from snd_pcm_hw_params_set_rate (%d): %d",
- rate, err);
- if((err = snd_pcm_hw_params_set_channels(pcm, hwparams,
- channels)) < 0)
- fatal(0, "error from snd_pcm_hw_params_set_channels (%d): %d",
- channels, err);
- if((err = snd_pcm_hw_params_set_buffer_size_near(pcm, hwparams,
- &pcm_bufsize)) < 0)
- fatal(0, "error from snd_pcm_hw_params_set_buffer_size (%d): %d",
- MAXSAMPLES * samplesize * 3, err);
- if((err = snd_pcm_hw_params(pcm, hwparams)) < 0)
- fatal(0, "error calling snd_pcm_hw_params: %d", err);
- /* Set up 'software' parameters */
- snd_pcm_sw_params_alloca(&swparams);
- if((err = snd_pcm_sw_params_current(pcm, swparams)) < 0)
- fatal(0, "error calling snd_pcm_sw_params_current: %d", err);
- if((err = snd_pcm_sw_params_set_avail_min(pcm, swparams, avail_min)) < 0)
- fatal(0, "error calling snd_pcm_sw_params_set_avail_min %d: %d",
- avail_min, err);
- if((err = snd_pcm_sw_params(pcm, swparams)) < 0)
- fatal(0, "error calling snd_pcm_sw_params: %d", err);
-
- /* Ready to go */
-
- time(&logged);
- pthread_mutex_lock(&lock);
- for(;;) {
- /* Wait for the buffer to fill up a bit */
- logged = now;
- info("%lu samples in buffer (%lus)", nsamples,
- nsamples / (44100 * 2));
- info("Buffering...");
- while(nsamples < readahead)
- pthread_cond_wait(&cond, &lock);
- if(!prepared) {
- if((err = snd_pcm_prepare(pcm)))
- fatal(0, "error calling snd_pcm_prepare: %d", err);
- prepared = 1;
- }
- active = 1;
- infilling = 0;
- escape = 0;
- logged = now;
- info("%lu samples in buffer (%lus)", nsamples,
- nsamples / (44100 * 2));
- info("Playing...");
- /* Wait until the buffer empties out */
- while(nsamples >= minbuffer && !escape) {
- time(&now);
- if(now > logged + 10) {
- logged = now;
- info("%lu samples in buffer (%lus)", nsamples,
- nsamples / (44100 * 2));
- }
- if(packets
- && ge(next_timestamp, packets->timestamp + packets->nsamples)) {
- info("dropping buffered past packet %"PRIx32" < %"PRIx32,
- packets->timestamp, next_timestamp);
- drop_first_packet();
- continue;
- }
- /* Wait for ALSA to ask us for more data */
- pthread_mutex_unlock(&lock);
- write(2, ".", 1); /* TODO remove me sometime */
- switch(err = snd_pcm_wait(pcm, -1)) {
- case 0:
- info("snd_pcm_wait timed out");
- break;
- case 1:
- break;
- default:
- fatal(0, "snd_pcm_wait returned %d", err);
- }
- pthread_mutex_lock(&lock);
- /* ALSA is ready for more data */
- packet_start = packets->timestamp;
- packet_end = packets->timestamp + packets->nsamples;
- if(ge(next_timestamp, packet_start)
- && lt(next_timestamp, packet_end)) {
- /* The target timestamp is somewhere in this packet */
- const uint32_t offset = next_timestamp - packets->timestamp;
- const uint32_t samples_available = (packets->timestamp + packets->nsamples) - next_timestamp;
- const size_t frames_available = samples_available / 2;
-
- frames_written = snd_pcm_writei(pcm,
- packets->samples_raw + offset,
- frames_available);
- if(frames_written < 0) {
- switch(frames_written) {
- case -EAGAIN:
- info("snd_pcm_wait() returned but we got -EAGAIN!");
- break;
- case -EPIPE:
- error(0, "error calling snd_pcm_writei: %ld",
- (long)frames_written);
- escape = 1;
- break;
- default:
- fatal(0, "error calling snd_pcm_writei: %ld",
- (long)frames_written);
- }
- } else {
- samples_written = frames_written * 2;
- next_timestamp += samples_written;
- if(ge(next_timestamp, packet_end))
- drop_first_packet();
- infilling = 0;
- }
- } else {
- /* We don't have anything to play! We'd better play some 0s. */
- static const uint16_t zeros[INFILL_SAMPLES];
- size_t samples_available = INFILL_SAMPLES, frames_available;
-
- /* If the maximum infill would take us past the start of the next
- * packet then we truncate the infill to the right amount. */
- if(lt(packets->timestamp,
- next_timestamp + samples_available))
- samples_available = packets->timestamp - next_timestamp;
- if((int)samples_available < 0) {
- info("packets->timestamp: %"PRIx32" next_timestamp: %"PRIx32" next+max: %"PRIx32" available: %"PRIx32,
- packets->timestamp, next_timestamp,
- next_timestamp + INFILL_SAMPLES, samples_available);
- }
- frames_available = samples_available / 2;
- if(!infilling) {
- info("Infilling %d samples, next=%"PRIx32" packet=[%"PRIx32",%"PRIx32"]",
- samples_available, next_timestamp,
- packets->timestamp, packets->timestamp + packets->nsamples);
- //infilling++;
- }
- frames_written = snd_pcm_writei(pcm,
- zeros,
- frames_available);
- if(frames_written < 0) {
- switch(frames_written) {
- case -EAGAIN:
- info("snd_pcm_wait() returned but we got -EAGAIN!");
- break;
- case -EPIPE:
- error(0, "error calling snd_pcm_writei: %ld",
- (long)frames_written);
- escape = 1;
- break;
- default:
- fatal(0, "error calling snd_pcm_writei: %ld",
- (long)frames_written);
- }
- } else {
- samples_written = frames_written * 2;
- next_timestamp += samples_written;
- }
- }
- }
- active = 0;
- /* We stop playing for a bit until the buffer re-fills */
- pthread_mutex_unlock(&lock);
- if((err = snd_pcm_nonblock(pcm, 0)))
- fatal(0, "error calling snd_pcm_nonblock: %d", err);
- if(escape) {
- if((err = snd_pcm_drop(pcm)))
- fatal(0, "error calling snd_pcm_drop: %d", err);
- escape = 0;
- } else
- if((err = snd_pcm_drain(pcm)))
- fatal(0, "error calling snd_pcm_drain: %d", err);
- if((err = snd_pcm_nonblock(pcm, 1)))
- fatal(0, "error calling snd_pcm_nonblock: %d", err);
- prepared = 0;
- pthread_mutex_lock(&lock);
- }
-
- }
-#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
- {
- OSStatus status;
- UInt32 propertySize;
- AudioDeviceID adid;
- AudioStreamBasicDescription asbd;
-
- /* If this looks suspiciously like libao's macosx driver there's an
- * excellent reason for that... */
-
- /* TODO report errors as strings not numbers */
- propertySize = sizeof adid;
- status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
- &propertySize, &adid);
- if(status)
- fatal(0, "AudioHardwareGetProperty: %d", (int)status);
- if(adid == kAudioDeviceUnknown)
- fatal(0, "no output device");
- propertySize = sizeof asbd;
- status = AudioDeviceGetProperty(adid, 0, false,
- kAudioDevicePropertyStreamFormat,
- &propertySize, &asbd);
- if(status)
- fatal(0, "AudioHardwareGetProperty: %d", (int)status);
- D(("mSampleRate %f", asbd.mSampleRate));
- D(("mFormatID %08lx", asbd.mFormatID));
- D(("mFormatFlags %08lx", asbd.mFormatFlags));
- D(("mBytesPerPacket %08lx", asbd.mBytesPerPacket));
- D(("mFramesPerPacket %08lx", asbd.mFramesPerPacket));
- D(("mBytesPerFrame %08lx", asbd.mBytesPerFrame));
- D(("mChannelsPerFrame %08lx", asbd.mChannelsPerFrame));
- D(("mBitsPerChannel %08lx", asbd.mBitsPerChannel));
- D(("mReserved %08lx", asbd.mReserved));
- if(asbd.mFormatID != kAudioFormatLinearPCM)
- fatal(0, "audio device does not support kAudioFormatLinearPCM");
- status = AudioDeviceAddIOProc(adid, adioproc, 0);
- if(status)
- fatal(0, "AudioDeviceAddIOProc: %d", (int)status);
- pthread_mutex_lock(&lock);
- for(;;) {
- /* Wait for the buffer to fill up a bit */
- info("Buffering...");
- while(nsamples < readahead)
- pthread_cond_wait(&cond, &lock);
- /* Start playing now */
- info("Playing...");
- next_timestamp = pheap_first(&packets)->timestamp;
- active = 1;
- status = AudioDeviceStart(adid, adioproc);
- if(status)
- fatal(0, "AudioDeviceStart: %d", (int)status);
- /* Wait until the buffer empties out */
- while(nsamples >= minbuffer)
- pthread_cond_wait(&cond, &lock);
- /* Stop playing for a bit until the buffer re-fills */
- status = AudioDeviceStop(adid, adioproc);
- if(status)
- fatal(0, "AudioDeviceStop: %d", (int)status);
- active = 0;
- /* Go back round */
- }
- }
-#else
-# error No known audio API
-#endif
+ if((err = pthread_create(<id, 0, listen_thread, 0)))
+ fatal(err, "pthread_create listen_thread");
+ /* We have a second thread to add received packets to the queue */
+ if((err = pthread_create(<id, 0, queue_thread, 0)))
+ fatal(err, "pthread_create queue_thread");
+ /* The rest of the work is backend-specific */
+ backend();
}
/* display usage message and terminate */
" --min, -m FRAMES Buffer low water mark\n"
" --buffer, -b FRAMES Buffer high water mark\n"
" --max, -x FRAMES Buffer maximum size\n"
+ " --rcvbuf, -R BYTES Socket receive buffer size\n"
+ " --config, -C PATH Set configuration file\n"
+#if HAVE_ALSA_ASOUNDLIB_H
+ " --alsa, -a Use ALSA to play audio\n"
+#endif
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+ " --oss, -o Use OSS to play audio\n"
+#endif
+#if HAVE_COREAUDIO_AUDIOHARDWARE_H
+ " --core-audio, -c Use Core Audio to play audio\n"
+#endif
" --help, -h Display usage message\n"
" --version, -V Display version number\n"
);
exit(0);
}
-/* display version number and terminate */
-static void version(void) {
- xprintf("disorder-playrtp version %s\n", disorder_version_string);
- xfclose(stdout);
- exit(0);
-}
-
int main(int argc, char **argv) {
- int n;
+ int n, err;
struct addrinfo *res;
struct stringlist sl;
char *sockname;
+ int rcvbuf, target_rcvbuf = 131072;
+ socklen_t len;
+ struct ip_mreq mreq;
+ struct ipv6_mreq mreq6;
+ disorder_client *c;
+ char *address, *port;
+ int is_multicast;
+ union any_sockaddr {
+ struct sockaddr sa;
+ struct sockaddr_in in;
+ struct sockaddr_in6 in6;
+ };
+ union any_sockaddr mgroup;
+ const char *dumpfile = 0;
static const struct addrinfo prefs = {
AI_PASSIVE,
mem_init();
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aocC:r", options, 0)) >= 0) {
switch(n) {
case 'h': help();
- case 'V': version();
+ case 'V': version("disorder-playrtp");
case 'd': debugging = 1; break;
case 'D': device = optarg; break;
case 'm': minbuffer = 2 * atol(optarg); break;
case 'b': readahead = 2 * atol(optarg); break;
case 'x': maxbuffer = 2 * atol(optarg); break;
case 'L': logfp = fopen(optarg, "w"); break;
+ case 'R': target_rcvbuf = atoi(optarg); break;
+#if HAVE_ALSA_ASOUNDLIB_H
+ case 'a': backend = playrtp_alsa; break;
+#endif
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+ case 'o': backend = playrtp_oss; break;
+#endif
+#if HAVE_COREAUDIO_AUDIOHARDWARE_H
+ case 'c': backend = playrtp_coreaudio; break;
+#endif
+ case 'C': configfile = optarg; break;
+ case 's': control_socket = optarg; break;
+ case 'r': dumpfile = optarg; break;
default: fatal(0, "invalid option");
}
}
+ if(config_read(0)) fatal(0, "cannot read configuration");
if(!maxbuffer)
maxbuffer = 4 * readahead;
argc -= optind;
argv += optind;
- if(argc < 1 || argc > 2)
- fatal(0, "usage: disorder-playrtp [OPTIONS] ADDRESS [PORT]");
- sl.n = argc;
- sl.s = argv;
- /* Listen for inbound audio data */
+ switch(argc) {
+ case 0:
+ /* Get configuration from server */
+ if(!(c = disorder_new(1))) exit(EXIT_FAILURE);
+ if(disorder_connect(c)) exit(EXIT_FAILURE);
+ if(disorder_rtp_address(c, &address, &port)) exit(EXIT_FAILURE);
+ sl.n = 2;
+ sl.s = xcalloc(2, sizeof *sl.s);
+ sl.s[0] = address;
+ sl.s[1] = port;
+ break;
+ case 1:
+ case 2:
+ /* Use command-line ADDRESS+PORT or just PORT */
+ sl.n = argc;
+ sl.s = argv;
+ break;
+ default:
+ fatal(0, "usage: disorder-playrtp [OPTIONS] [[ADDRESS] PORT]");
+ }
+ /* Look up address and port */
if(!(res = get_address(&sl, &prefs, &sockname)))
exit(1);
+ /* Create the socket */
if((rtpfd = socket(res->ai_family,
res->ai_socktype,
res->ai_protocol)) < 0)
fatal(errno, "error creating socket");
+ /* Stash the multicast group address */
+ if((is_multicast = multicast(res->ai_addr))) {
+ memcpy(&mgroup, res->ai_addr, res->ai_addrlen);
+ switch(res->ai_addr->sa_family) {
+ case AF_INET:
+ mgroup.in.sin_port = 0;
+ break;
+ case AF_INET6:
+ mgroup.in6.sin6_port = 0;
+ break;
+ }
+ }
+ /* Bind to 0/port */
+ switch(res->ai_addr->sa_family) {
+ case AF_INET:
+ memset(&((struct sockaddr_in *)res->ai_addr)->sin_addr, 0,
+ sizeof (struct in_addr));
+ break;
+ case AF_INET6:
+ memset(&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr, 0,
+ sizeof (struct in6_addr));
+ break;
+ default:
+ fatal(0, "unsupported family %d", (int)res->ai_addr->sa_family);
+ }
if(bind(rtpfd, res->ai_addr, res->ai_addrlen) < 0)
fatal(errno, "error binding socket to %s", sockname);
+ if(is_multicast) {
+ switch(mgroup.sa.sa_family) {
+ case PF_INET:
+ mreq.imr_multiaddr = mgroup.in.sin_addr;
+ mreq.imr_interface.s_addr = 0; /* use primary interface */
+ if(setsockopt(rtpfd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+ &mreq, sizeof mreq) < 0)
+ fatal(errno, "error calling setsockopt IP_ADD_MEMBERSHIP");
+ break;
+ case PF_INET6:
+ mreq6.ipv6mr_multiaddr = mgroup.in6.sin6_addr;
+ memset(&mreq6.ipv6mr_interface, 0, sizeof mreq6.ipv6mr_interface);
+ if(setsockopt(rtpfd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+ &mreq6, sizeof mreq6) < 0)
+ fatal(errno, "error calling setsockopt IPV6_JOIN_GROUP");
+ break;
+ default:
+ fatal(0, "unsupported address family %d", res->ai_family);
+ }
+ info("listening on %s multicast group %s",
+ format_sockaddr(res->ai_addr), format_sockaddr(&mgroup.sa));
+ } else
+ info("listening on %s", format_sockaddr(res->ai_addr));
+ len = sizeof rcvbuf;
+ if(getsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, &len) < 0)
+ fatal(errno, "error calling getsockopt SO_RCVBUF");
+ if(target_rcvbuf > rcvbuf) {
+ if(setsockopt(rtpfd, SOL_SOCKET, SO_RCVBUF,
+ &target_rcvbuf, sizeof target_rcvbuf) < 0)
+ error(errno, "error calling setsockopt SO_RCVBUF %d",
+ target_rcvbuf);
+ /* We try to carry on anyway */
+ else
+ info("changed socket receive buffer from %d to %d",
+ rcvbuf, target_rcvbuf);
+ } else
+ info("default socket receive buffer %d", rcvbuf);
+ if(logfp)
+ info("WARNING: -L option can impact performance");
+ if(control_socket) {
+ pthread_t tid;
+
+ if((err = pthread_create(&tid, 0, control_thread, 0)))
+ fatal(err, "pthread_create control_thread");
+ }
+ if(dumpfile) {
+ int fd;
+ unsigned char buffer[65536];
+ size_t written;
+
+ if((fd = open(dumpfile, O_RDWR|O_TRUNC|O_CREAT, 0666)) < 0)
+ fatal(errno, "opening %s", dumpfile);
+ /* Fill with 0s to a suitable size */
+ memset(buffer, 0, sizeof buffer);
+ for(written = 0; written < dump_size * sizeof(int16_t);
+ written += sizeof buffer) {
+ if(write(fd, buffer, sizeof buffer) < 0)
+ fatal(errno, "clearing %s", dumpfile);
+ }
+ /* Map the buffer into memory for convenience */
+ dump_buffer = mmap(0, dump_size * sizeof(int16_t), PROT_READ|PROT_WRITE,
+ MAP_SHARED, fd, 0);
+ if(dump_buffer == (void *)-1)
+ fatal(errno, "mapping %s", dumpfile);
+ info("dumping to %s", dumpfile);
+ }
play_rtp();
return 0;
}
~mdw / disorder / blobdiff