X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/bfd27c143e12fd330d30f444fcff72a21cfaf5a7..4942ee7d61bf22ba38bf026c7d05028cb7db0d54:/clients/playrtp.c diff --git a/clients/playrtp.c b/clients/playrtp.c index 33623ab..7eed9eb 100644 --- a/clients/playrtp.c +++ b/clients/playrtp.c @@ -1,21 +1,19 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007 Richard Kettlewell + * Copyright (C) 2007-2009 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 clients/playrtp.c * @brief RTP player @@ -26,19 +24,20 @@ * 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 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. * - * 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. + * 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). * - * InCore 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. + * control_thread() accepts commands from Disobedience (or anything else). + * + * The main thread activates and deactivates audio playing via the @ref + * lib/uaudio.h API (which probably implies at least one further thread). * * 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 @@ -48,12 +47,9 @@ * - it is safe to read uint32_t values without a lock protecting them */ -#include -#include "types.h" +#include "common.h" #include -#include -#include #include #include #include @@ -61,7 +57,14 @@ #include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "log.h" #include "mem.h" @@ -73,16 +76,17 @@ #include "vector.h" #include "heap.h" #include "timeval.h" - -#if HAVE_COREAUDIO_AUDIOHARDWARE_H -# include -#endif -#if API_ALSA -#include +#include "client.h" +#include "playrtp.h" +#include "inputline.h" +#include "version.h" +#include "uaudio.h" + +/** @brief Obsolete synonym */ +#ifndef IPV6_JOIN_GROUP +# define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP #endif -#define readahead linux_headers_are_borked - /** @brief RTP socket */ static int rtpfd; @@ -90,101 +94,15 @@ 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 - -/** @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 Buffer high watermark - * - * We'll only start playing when this many samples are available. */ -static unsigned readahead = 2 * 2 * 44100; - -/** @brief Maximum buffer size - * - * 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 - * - * 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. - */ -#define INFILL_SAMPLES (44100 * 2) /* 1s */ - -/** @brief Received packet - * - * Received packets are kept in a binary heap (see @ref pheap) ordered by - * timestamp. - */ -struct packet { - /** @brief Next packet in @ref next_free_packet or @ref received_packets */ - struct packet *next; - - /** @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; -/** @brief idle bit set in RTP packet*/ -#define IDLE 0x0001 +/** @brief Buffer low watermark in samples */ +unsigned minbuffer = 4 * (2 * 44100) / 10; /* 0.4 seconds */ - /** @brief Raw sample data - * - * Only the first @p nsamples samples are defined; the rest is uninitialized - * data. - */ - uint16_t samples_raw[MAXSAMPLES]; -}; - -/** @brief Return true iff \f$a < b\f$ in sequence-space arithmetic - * - * Specifically it returns true if \f$(a-b) mod 2^{32} < 2^{31}\f$. +/** @brief Maximum buffer size in samples * - * See also lt_packet(). + * We'll stop reading from the network if we have this many samples. */ -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); -} - -/** @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); -} +static unsigned maxbuffer; /** @brief Received packets * Protected by @ref receive_lock @@ -193,94 +111,84 @@ static inline int lt_packet(const struct packet *a, const struct packet *b) { * it and adds them to @ref packets. Whenever a packet is added to it, @ref * receive_cond is signalled. */ -static struct packet *received_packets; +struct packet *received_packets; /** @brief Tail of @ref received_packets * Protected by @ref receive_lock */ -static struct packet **received_tail = &received_packets; +struct packet **received_tail = &received_packets; /** @brief Lock protecting @ref received_packets * * 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. */ -static pthread_mutex_t receive_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t receive_lock = PTHREAD_MUTEX_INITIALIZER; /** @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. */ -static pthread_cond_t receive_cond = PTHREAD_COND_INITIALIZER; +pthread_cond_t receive_cond = PTHREAD_COND_INITIALIZER; /** @brief Length of @ref received_packets */ -static uint32_t nreceived; - -/** @struct pheap - * @brief Binary heap of packets ordered by timestamp */ -HEAP_TYPE(pheap, struct packet *, lt_packet); +uint32_t nreceived; /** @brief Binary heap of received packets */ -static struct pheap packets; +struct pheap packets; /** @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. */ -static volatile uint32_t nsamples; +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 Lock protecting @ref packets */ -static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; /** @brief Condition variable signalled whenever @ref packets is changed */ -static pthread_cond_t cond = PTHREAD_COND_INITIALIZER; +pthread_cond_t cond = PTHREAD_COND_INITIALIZER; -/** @brief Structure of free packet list */ -union free_packet { - struct packet p; - union free_packet *next; -}; +/** @brief Backend to play with */ +static const struct uaudio *backend; + +HEAP_DEFINE(pheap, struct packet *, lt_packet); -/** @brief Linked list of free packets +/** @brief Control socket or NULL */ +const char *control_socket; + +/** @brief Buffer for debugging dump * - * 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. + * 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 *free_packets; - -/** @brief Array of new free packets + * Use clients/dump2wav to convert this to a WAV file, which can then be loaded + * into (e.g.) Audacity for further inspection. * - * There are @ref count_free_packets ready to use at this address. If there - * are none left we allocate more memory. + * 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 union free_packet *next_free_packet; +int16_t *dump_buffer; -/** @brief Count of new free packets at @ref next_free_packet - * - * Must hold @ref lock when accessing this. - */ -static size_t count_free_packets; +/** @brief Current index within debugging dump */ +size_t dump_index; -/** @brief Lock protecting packet allocator */ -static pthread_mutex_t mem_lock = PTHREAD_MUTEX_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' }, @@ -289,38 +197,89 @@ static const struct option options[] = { { "device", required_argument, 0, 'D' }, { "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' }, + { "command", required_argument, 0, 'e' }, + { "pause-mode", required_argument, 0, 'P' }, + { "socket", required_argument, 0, 's' }, + { "config", required_argument, 0, 'C' }, + { "monitor", no_argument, 0, 'M' }, { 0, 0, 0, 0 } }; -/** @brief Return a new packet */ -static struct packet *new_packet(void) { - struct packet *p; - - pthread_mutex_lock(&mem_lock); - 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; +/** @brief Control thread + * + * 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; } - p = &(next_free_packet++)->p; - --count_free_packets; + 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); + } + if(fclose(fp) < 0) + error(errno, "error closing %s connection", control_socket); } - pthread_mutex_unlock(&mem_lock); - return p; -} - -/** @brief Free a packet */ -static void free_packet(struct packet *p) { - union free_packet *u = (union free_packet *)p; - pthread_mutex_lock(&mem_lock); - u->next = free_packets; - free_packets = u; - pthread_mutex_unlock(&mem_lock); } /** @brief Drop the first packet @@ -331,7 +290,7 @@ static void drop_first_packet(void) { 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); } } @@ -349,8 +308,9 @@ static void *queue_thread(void attribute((unused)) *arg) { for(;;) { /* Get the next packet */ pthread_mutex_lock(&receive_lock); - while(!received_packets) + while(!received_packets) { pthread_cond_wait(&receive_cond, &receive_lock); + } p = received_packets; received_packets = p->next; if(!received_packets) @@ -364,6 +324,9 @@ static void *queue_thread(void attribute((unused)) *arg) { pthread_cond_broadcast(&cond); pthread_mutex_unlock(&lock); } +#if HAVE_STUPID_GCC44 + return NULL; +#endif } /** @brief Background thread collecting samples @@ -385,7 +348,7 @@ static void *queue_thread(void attribute((unused)) *arg) { * 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 new_packet(). + * packets around; see @ref playrtp_new_packet(). */ static void *listen_thread(void attribute((unused)) *arg) { struct packet *p = 0; @@ -397,7 +360,7 @@ static void *listen_thread(void attribute((unused)) *arg) { for(;;) { if(!p) - p = new_packet(); + p = playrtp_new_packet(); iov[0].iov_base = &header; iov[0].iov_len = sizeof header; iov[1].iov_base = p->samples_raw; @@ -424,6 +387,9 @@ static void *listen_thread(void attribute((unused)) *arg) { timestamp, next_timestamp); continue; } + /* Ignore packets with the extension bit set. */ + if(header.vpxcc & 0x10) + continue; p->next = 0; p->flags = 0; p->timestamp = timestamp; @@ -431,7 +397,7 @@ static void *listen_thread(void attribute((unused)) *arg) { if(header.mpt & 0x80) p->flags |= IDLE; switch(header.mpt & 0x7F) { - case 10: + case 10: /* L16 */ p->nsamples = (n - sizeof header) / sizeof(uint16_t); break; /* TODO support other RFC3551 media types (when the speaker does) */ @@ -439,6 +405,14 @@ static void *listen_thread(void attribute((unused)) *arg) { fatal(0, "unsupported RTP payload type %d", header.mpt & 0x7F); } + /* See if packet is silent */ + const uint16_t *s = p->samples_raw; + n = p->nsamples; + for(; n > 0; --n) + if(*s++) + break; + if(!n) + p->flags |= SILENT; if(logfp) fprintf(logfp, "sequence %u timestamp %"PRIx32" length %"PRIx32" end %"PRIx32"\n", seq, timestamp, p->nsamples, timestamp + p->nsamples); @@ -448,8 +422,9 @@ static void *listen_thread(void attribute((unused)) *arg) { * out of order then we guarantee dropouts. But for now... */ if(nsamples >= maxbuffer) { pthread_mutex_lock(&lock); - while(nsamples >= maxbuffer) + while(nsamples >= maxbuffer) { pthread_cond_wait(&cond, &lock); + } pthread_mutex_unlock(&lock); } /* Add the packet to the receive queue */ @@ -464,28 +439,23 @@ static void *listen_thread(void attribute((unused)) *arg) { } } -/** @brief Return true if @p p contains @p timestamp - * - * Containment implies that a sample @p timestamp exists within the packet. - */ -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. */ -static void fill_buffer(void) { - while(nsamples) +void playrtp_fill_buffer(void) { + /* Discard current buffer contents */ + while(nsamples) { + //fprintf(stderr, "%8u/%u (%u) DROPPING\n", nsamples, maxbuffer, minbuffer); drop_first_packet(); + } info("Buffering..."); - while(nsamples < readahead) + /* Wait until there's at least minbuffer samples available */ + while(nsamples < minbuffer) { + //fprintf(stderr, "%8u/%u (%u) FILLING\n", nsamples, maxbuffer, minbuffer); pthread_cond_wait(&cond, &lock); + } + /* Start from whatever is earliest */ next_timestamp = pheap_first(&packets)->timestamp; active = 1; } @@ -499,7 +469,7 @@ static void fill_buffer(void) { * * Must be called with @ref lock held. */ -static struct packet *next_packet(void) { +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)) { @@ -513,346 +483,28 @@ static struct packet *next_packet(void) { return 0; } -#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; - uint32_t samples_available; - - pthread_mutex_lock(&lock); - while(nbuffers > 0) { - float *samplesOut = ab->mData; - size_t samplesOutLeft = ab->mDataByteSize / sizeof (float); - - while(samplesOutLeft > 0) { - const struct packet *p = next_packet(); - if(p && contains(p, next_timestamp)) { - /* 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); - - 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 */ - } 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; - } - } - ++ab; - --nbuffers; - } - pthread_mutex_unlock(&lock); - return 0; -} -#endif - - -#if API_ALSA -/** @brief PCM handle */ -static snd_pcm_t *pcm; - -/** @brief True when @ref pcm is up and running */ -static int alsa_prepared = 1; - -/** @brief Initialize @ref pcm */ -static void setup_alsa(void) { - 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; - int err; - - /* 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); -} - -/** @brief Wait until ALSA wants some audio */ -static void wait_alsa(void) { - struct pollfd fds[64]; - int nfds, err; - unsigned short events; - - for(;;) { - do { - if((nfds = snd_pcm_poll_descriptors(pcm, - fds, sizeof fds / sizeof *fds)) < 0) - fatal(0, "error calling snd_pcm_poll_descriptors: %d", nfds); - } while(poll(fds, nfds, -1) < 0 && errno == EINTR); - if((err = snd_pcm_poll_descriptors_revents(pcm, fds, nfds, &events))) - fatal(0, "error calling snd_pcm_poll_descriptors_revents: %d", err); - if(events & POLLOUT) - return; - } -} - -/** @brief Play some sound via ALSA - * @param s Pointer to sample data - * @param n Number of samples - * @return 0 on success, -1 on non-fatal error - */ -static int alsa_writei(const void *s, size_t n) { - /* Do the write */ - const snd_pcm_sframes_t frames_written = snd_pcm_writei(pcm, s, n / 2); - if(frames_written < 0) { - /* Something went wrong */ - switch(frames_written) { - case -EAGAIN: - return 0; - case -EPIPE: - error(0, "error calling snd_pcm_writei: %ld", - (long)frames_written); - return -1; - default: - fatal(0, "error calling snd_pcm_writei: %ld", - (long)frames_written); - } - } else { - /* Success */ - next_timestamp += frames_written * 2; - return 0; - } -} - -/** @brief Play the relevant part of a packet - * @param p Packet to play - * @return 0 on success, -1 on non-fatal error - */ -static int alsa_play(const struct packet *p) { - return alsa_writei(p->samples_raw + next_timestamp - p->timestamp, - (p->timestamp + p->nsamples) - next_timestamp); -} - -/** @brief Play some silence - * @param p Next packet or NULL - * @return 0 on success, -1 on non-fatal error - */ -static int alsa_infill(const struct packet *p) { - static const uint16_t zeros[INFILL_SAMPLES]; - size_t samples_available = INFILL_SAMPLES; - - if(p && samples_available > p->timestamp - next_timestamp) - samples_available = p->timestamp - next_timestamp; - return alsa_writei(zeros, samples_available); -} - -/** @brief Reset ALSA state after we lost synchronization */ -static void alsa_reset(int hard_reset) { - int err; - - if((err = snd_pcm_nonblock(pcm, 0))) - fatal(0, "error calling snd_pcm_nonblock: %d", err); - if(hard_reset) { - if((err = snd_pcm_drop(pcm))) - fatal(0, "error calling snd_pcm_drop: %d", err); - } 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); - alsa_prepared = 0; -} -#endif - -/** @brief Play an RTP stream - * - * This is the guts of the program. It is responsible for: - * - starting the listening thread - * - opening the audio device - * - reading ahead to build up a buffer - * - arranging for audio to be played - * - detecting when the buffer has got too small and re-buffering - */ -static void play_rtp(void) { - pthread_t ltid; - - /* We receive and convert audio data in a background thread */ - pthread_create(<id, 0, listen_thread, 0); - /* We have a second thread to add received packets to the queue */ - pthread_create(<id, 0, queue_thread, 0); -#if API_ALSA - { - struct packet *p; - int escape, err; - - /* Open the sound device */ - setup_alsa(); - pthread_mutex_lock(&lock); - for(;;) { - /* Wait for the buffer to fill up a bit */ - fill_buffer(); - if(!alsa_prepared) { - if((err = snd_pcm_prepare(pcm))) - fatal(0, "error calling snd_pcm_prepare: %d", err); - alsa_prepared = 1; - } - escape = 0; - info("Playing..."); - /* Keep playing until the buffer empties out, or ALSA tells us to get - * lost */ - while(nsamples >= minbuffer && !escape) { - /* Wait for ALSA to ask us for more data */ - pthread_mutex_unlock(&lock); - wait_alsa(); - pthread_mutex_lock(&lock); - /* ALSA is ready for more data, find something to play */ - p = next_packet(); - /* Play it or play some silence */ - if(contains(p, next_timestamp)) - escape = alsa_play(p); - else - escape = alsa_infill(p); - } - active = 0; - /* We stop playing for a bit until the buffer re-fills */ - pthread_mutex_unlock(&lock); - alsa_reset(escape); - 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 */ - fill_buffer(); - /* 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 -} - /* display usage message and terminate */ static void help(void) { xprintf("Usage:\n" - " disorder-playrtp [OPTIONS] ADDRESS [PORT]\n" + " disorder-playrtp [OPTIONS] [[ADDRESS] PORT]\n" "Options:\n" " --device, -D DEVICE Output device\n" " --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 + " --command, -e COMMAND Pipe audio to command.\n" + " --pause-mode, -P silence For -e: pauses send silence (default)\n" + " --pause-mode, -P suspend For -e: pauses suspend writes\n" " --help, -h Display usage message\n" " --version, -V Display version number\n" ); @@ -860,65 +512,272 @@ static void help(void) { exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("disorder-playrtp version %s\n", disorder_version_string); - xfclose(stdout); - exit(0); +static size_t playrtp_callback(void *buffer, + size_t max_samples, + void attribute((unused)) *userdata) { + size_t samples; + int silent = 0; + + pthread_mutex_lock(&lock); + /* Get the next packet, junking any that are now in the past */ + const struct packet *p = playrtp_next_packet(); + if(p && contains(p, next_timestamp)) { + /* This packet is ready to play; the desired next timestamp points + * somewhere into it. */ + + /* Timestamp of end of packet */ + const uint32_t packet_end = p->timestamp + p->nsamples; + + /* Offset of desired next timestamp into current packet */ + const uint32_t offset = next_timestamp - p->timestamp; + + /* Pointer to audio data */ + const uint16_t *ptr = (void *)(p->samples_raw + offset); + + /* Compute number of samples left in packet, limited to output buffer + * size */ + samples = packet_end - next_timestamp; + if(samples > max_samples) + samples = max_samples; + + /* Copy into buffer, converting to native endianness */ + size_t i = samples; + int16_t *bufptr = buffer; + while(i > 0) { + *bufptr++ = (int16_t)ntohs(*ptr++); + --i; + } + silent = !!(p->flags & SILENT); + } else { + /* There is no suitable packet. We introduce 0s up to the next packet, or + * to fill the buffer if there's no next packet or that's too many. The + * comparison with max_samples deals with the otherwise troubling overflow + * case. */ + samples = p ? p->timestamp - next_timestamp : max_samples; + if(samples > max_samples) + samples = max_samples; + //info("infill by %zu", samples); + memset(buffer, 0, samples * uaudio_sample_size); + silent = 1; + } + /* Debug dump */ + if(dump_buffer) { + for(size_t i = 0; i < samples; ++i) { + dump_buffer[dump_index++] = ((int16_t *)buffer)[i]; + dump_index %= dump_size; + } + } + /* Advance timestamp */ + next_timestamp += samples; + /* If we're getting behind then try to drop just silent packets + * + * In theory this shouldn't be necessary. The server is supposed to send + * packets at the right rate and compares the number of samples sent with the + * time in order to ensure this. + * + * However, various things could throw this off: + * + * - the server's clock could advance at the wrong rate. This would cause it + * to mis-estimate the right number of samples to have sent and + * inappropriately throttle or speed up. + * + * - playback could happen at the wrong rate. If the playback host's sound + * card has a slightly incorrect clock then eventually it will get out + * of step. + * + * So if we play back slightly slower than the server sends for either of + * these reasons then eventually our buffer, and the socket's buffer, will + * fill, and the kernel will start dropping packets. The result is audible + * and not very nice. + * + * Therefore if we're getting behind, we pre-emptively drop silent packets, + * since a change in the duration of a silence is less noticeable than a + * dropped packet from the middle of continuous music. + * + * (If things go wrong the other way then eventually we run out of packets to + * play and are forced to play silence. This doesn't seem to happen in + * practice but if it does then in the same way we can artificially extend + * silent packets to compensate.) + * + * Dropped packets are always logged; use 'disorder-playrtp --monitor' to + * track how close to target buffer occupancy we are on a once-a-minute + * basis. + */ + if(nsamples > minbuffer && silent) { + info("dropping %zu samples (%"PRIu32" > %"PRIu32")", + samples, nsamples, minbuffer); + samples = 0; + } + /* Junk obsolete packets */ + playrtp_next_packet(); + pthread_mutex_unlock(&lock); + return samples; } int main(int argc, char **argv) { - int n; + int n, err; struct addrinfo *res; struct stringlist sl; char *sockname; - int rcvbuf, target_rcvbuf = 131072; + int rcvbuf, target_rcvbuf = 0; 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; + pthread_t ltid; + int monitor = 0; + static const int one = 1; static const struct addrinfo prefs = { - 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 }; + /* Timing information is often important to debugging playrtp, so we include + * timestamps in the logs */ + logdate = 1; mem_init(); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:", options, 0)) >= 0) { + backend = uaudio_apis[0]; + while((n = getopt_long(argc, argv, "hVdD:m:x:L:R:aocC:re:P:M", 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 'D': uaudio_set("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 = &uaudio_alsa; break; +#endif +#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST + case 'o': backend = &uaudio_oss; break; +#endif +#if HAVE_COREAUDIO_AUDIOHARDWARE_H + case 'c': backend = &uaudio_coreaudio; break; +#endif + case 'C': configfile = optarg; break; + case 's': control_socket = optarg; break; + case 'r': dumpfile = optarg; break; + case 'e': backend = &uaudio_command; uaudio_set("command", optarg); break; + case 'P': uaudio_set("pause-mode", optarg); break; + case 'M': monitor = 1; break; default: fatal(0, "invalid option"); } } + if(config_read(0, NULL)) fatal(0, "cannot read configuration"); if(!maxbuffer) - maxbuffer = 4 * readahead; + maxbuffer = 2 * minbuffer; 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"); - if(bind(rtpfd, res->ai_addr, res->ai_addrlen) < 0) - fatal(errno, "error binding socket to %s", sockname); + /* Allow multiple listeners */ + xsetsockopt(rtpfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one); + is_multicast = multicast(res->ai_addr); + /* The multicast and unicast/broadcast cases are different enough that they + * are totally split. Trying to find commonality between them causes more + * trouble that it's worth. */ + if(is_multicast) { + /* Stash the multicast group address */ + 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; + default: + fatal(0, "unsupported family %d", (int)res->ai_addr->sa_family); + } + /* Bind to to the multicast group address */ + if(bind(rtpfd, res->ai_addr, res->ai_addrlen) < 0) + fatal(errno, "error binding socket to %s", format_sockaddr(res->ai_addr)); + /* Add multicast group membership */ + 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); + } + /* Report what we did */ + info("listening on %s multicast group %s", + format_sockaddr(res->ai_addr), format_sockaddr(&mgroup.sa)); + } else { + /* Bind to 0/port */ + switch(res->ai_addr->sa_family) { + case AF_INET: { + struct sockaddr_in *in = (struct sockaddr_in *)res->ai_addr; + + memset(&in->sin_addr, 0, sizeof (struct in_addr)); + break; + } + case AF_INET6: { + struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)res->ai_addr; + + memset(&in6->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", format_sockaddr(res->ai_addr)); + /* Report what we did */ + 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"); @@ -933,9 +792,102 @@ int main(int argc, char **argv) { rcvbuf, target_rcvbuf); } else info("default socket receive buffer %d", rcvbuf); + //info("minbuffer %u maxbuffer %u", minbuffer, maxbuffer); if(logfp) info("WARNING: -L option can impact performance"); - play_rtp(); + 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); + } + /* Set up output. Currently we only support L16 so there's no harm setting + * the format before we know what it is! */ + uaudio_set_format(44100/*Hz*/, 2/*channels*/, + 16/*bits/channel*/, 1/*signed*/); + backend->start(playrtp_callback, NULL); + /* We receive and convert audio data in a background thread */ + 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"); + pthread_mutex_lock(&lock); + time_t lastlog = 0; + for(;;) { + /* Wait for the buffer to fill up a bit */ + playrtp_fill_buffer(); + /* Start playing now */ + info("Playing..."); + next_timestamp = pheap_first(&packets)->timestamp; + active = 1; + pthread_mutex_unlock(&lock); + backend->activate(); + pthread_mutex_lock(&lock); + /* Wait until the buffer empties out + * + * If there's a packet that we can play right now then we definitely + * continue. + * + * Also if there's at least minbuffer samples we carry on regardless and + * insert silence. The assumption is there's been a pause but more data + * is now available. + */ + while(nsamples >= minbuffer + || (nsamples > 0 + && contains(pheap_first(&packets), next_timestamp))) { + if(monitor) { + time_t now = xtime(0); + + if(now >= lastlog + 60) { + int offset = nsamples - minbuffer; + double offtime = (double)offset / (uaudio_rate * uaudio_channels); + info("%+d samples off (%d.%02ds, %d bytes)", + offset, + (int)fabs(offtime) * (offtime < 0 ? -1 : 1), + (int)(fabs(offtime) * 100) % 100, + offset * uaudio_bits / CHAR_BIT); + lastlog = now; + } + } + //fprintf(stderr, "%8u/%u (%u) PLAYING\n", nsamples, maxbuffer, minbuffer); + pthread_cond_wait(&cond, &lock); + } +#if 0 + if(nsamples) { + struct packet *p = pheap_first(&packets); + fprintf(stderr, "nsamples=%u (%u) next_timestamp=%"PRIx32", first packet is [%"PRIx32",%"PRIx32")\n", + nsamples, minbuffer, next_timestamp,p->timestamp,p->timestamp+p->nsamples); + } +#endif + /* Stop playing for a bit until the buffer re-fills */ + pthread_mutex_unlock(&lock); + backend->deactivate(); + pthread_mutex_lock(&lock); + active = 0; + /* Go back round */ + } return 0; }