X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9fbe0996fdfc08527b76667ef286963587becd8d..f15929695c1154fc9959e66ecb1d4aad1558fe0a:/clients/playrtp.c diff --git a/clients/playrtp.c b/clients/playrtp.c index 908c619..484d265 100644 --- a/clients/playrtp.c +++ b/clients/playrtp.c @@ -69,6 +69,8 @@ #include #include #include +#include +#include #include "log.h" #include "mem.h" @@ -190,6 +192,27 @@ HEAP_DEFINE(pheap, struct packet *, lt_packet); /** @brief Control socket or NULL */ const char *control_socket; +/** @brief Buffer for debugging dump + * + * 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. + * + * 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. + * + * The idea is to allow the user a few seconds to react to an audible artefact. + */ +int16_t *dump_buffer; + +/** @brief Current index within debugging dump */ +size_t dump_index; + +/** @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' }, { "version", no_argument, 0, 'V' }, @@ -199,7 +222,6 @@ static const struct option options[] = { { "max", required_argument, 0, 'x' }, { "buffer", required_argument, 0, 'b' }, { "rcvbuf", required_argument, 0, 'R' }, - { "multicast", required_argument, 0, 'M' }, #if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST { "oss", no_argument, 0, 'o' }, #endif @@ -209,6 +231,7 @@ static const struct option options[] = { #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 } @@ -491,7 +514,6 @@ static void help(void) { " --buffer, -b FRAMES Buffer high water mark\n" " --max, -x FRAMES Buffer maximum size\n" " --rcvbuf, -R BYTES Socket receive buffer size\n" - " --multicast, -M GROUP Join multicast group\n" " --config, -C PATH Set configuration file\n" #if HAVE_ALSA_ASOUNDLIB_H " --alsa, -a Use ALSA to play audio\n" @@ -511,7 +533,7 @@ static void help(void) { /* display version number and terminate */ static void version(void) { - xprintf("disorder-playrtp version %s\n", disorder_version_string); + xprintf("%s", disorder_version_string); xfclose(stdout); exit(0); } @@ -523,11 +545,18 @@ int main(int argc, char **argv) { char *sockname; int rcvbuf, target_rcvbuf = 131072; socklen_t len; - char *multicast_group = 0; 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, @@ -542,7 +571,7 @@ int main(int argc, char **argv) { mem_init(); if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); - while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aocC:", 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(); @@ -553,7 +582,6 @@ int main(int argc, char **argv) { case 'x': maxbuffer = 2 * atol(optarg); break; case 'L': logfp = fopen(optarg, "w"); break; case 'R': target_rcvbuf = atoi(optarg); break; - case 'M': multicast_group = optarg; break; #if HAVE_ALSA_ASOUNDLIB_H case 'a': backend = playrtp_alsa; break; #endif @@ -565,6 +593,7 @@ int main(int argc, char **argv) { #endif case 'C': configfile = optarg; break; case 's': control_socket = optarg; break; + case 'r': dumpfile = optarg; break; default: fatal(0, "invalid option"); } } @@ -575,44 +604,70 @@ int main(int argc, char **argv) { argv += optind; switch(argc) { case 0: - case 1: + /* 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 = 1; - sl.s = &port; - /* set multicast_group if address is a multicast address */ + 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]]"); + fatal(0, "usage: disorder-playrtp [OPTIONS] [[ADDRESS] PORT]"); } - /* Listen for inbound audio data */ + /* Look up address and port */ if(!(res = get_address(&sl, &prefs, &sockname))) exit(1); - info("listening on %s", sockname); + /* 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(multicast_group) { - if((n = getaddrinfo(multicast_group, 0, &prefs, &res))) - fatal(0, "getaddrinfo %s: %s", multicast_group, gai_strerror(n)); - switch(res->ai_family) { + if(is_multicast) { + switch(mgroup.sa.sa_family) { case PF_INET: - mreq.imr_multiaddr = ((struct sockaddr_in *)res->ai_addr)->sin_addr; + 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 = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr; + 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) @@ -621,7 +676,10 @@ int main(int argc, char **argv) { 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"); @@ -644,6 +702,27 @@ int main(int argc, char **argv) { 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; }