X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e99a9fd614f9bd1d205e00b47e3e669b7735b91f..f87532949a0834686852e1cf59519d948c59eee7:/clients/playrtp.c diff --git a/clients/playrtp.c b/clients/playrtp.c index f5f538d..2ab6790 100644 --- a/clients/playrtp.c +++ b/clients/playrtp.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2007, 2008 Richard Kettlewell + * Copyright (C) 2007-2009 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 @@ -64,6 +64,7 @@ #include #include #include +#include #include "log.h" #include "mem.h" @@ -211,6 +212,7 @@ static const struct option options[] = { { "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 } }; @@ -245,10 +247,10 @@ static void *control_thread(void attribute((unused)) *arg) { 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); + disorder_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); + disorder_fatal(errno, "error calling listen on %s", control_socket); + disorder_info("listening on %s", control_socket); for(;;) { salen = sizeof sa; cfd = accept(sfd, (struct sockaddr *)&sa, &salen); @@ -258,17 +260,17 @@ static void *control_thread(void attribute((unused)) *arg) { case EAGAIN: break; default: - fatal(errno, "error calling accept on %s", control_socket); + disorder_fatal(errno, "error calling accept on %s", control_socket); } } if(!(fp = fdopen(cfd, "r+"))) { - error(errno, "error calling fdopen for %s connection", control_socket); + disorder_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); + disorder_info("stopped via %s", control_socket); exit(0); /* terminate immediately */ } if(!strcmp(line, "query")) @@ -276,7 +278,7 @@ static void *control_thread(void attribute((unused)) *arg) { xfree(line); } if(fclose(fp) < 0) - error(errno, "error closing %s connection", control_socket); + disorder_error(errno, "error closing %s connection", control_socket); } } @@ -322,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 @@ -366,19 +371,19 @@ static void *listen_thread(void attribute((unused)) *arg) { case EINTR: continue; default: - fatal(errno, "error reading from socket"); + disorder_fatal(errno, "error reading from socket"); } } /* Ignore too-short packets */ if((size_t)n <= sizeof (struct rtp_header)) { - info("ignored a short packet"); + disorder_info("ignored a short packet"); continue; } timestamp = htonl(header.timestamp); seq = htons(header.seq); /* Ignore packets in the past */ if(active && lt(timestamp, next_timestamp)) { - info("dropping old packet, timestamp=%"PRIx32" < %"PRIx32, + disorder_info("dropping old packet, timestamp=%"PRIx32" < %"PRIx32, timestamp, next_timestamp); continue; } @@ -397,9 +402,16 @@ static void *listen_thread(void attribute((unused)) *arg) { break; /* TODO support other RFC3551 media types (when the speaker does) */ default: - fatal(0, "unsupported RTP payload type %d", - header.mpt & 0x7F); + disorder_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); @@ -436,7 +448,7 @@ void playrtp_fill_buffer(void) { //fprintf(stderr, "%8u/%u (%u) DROPPING\n", nsamples, maxbuffer, minbuffer); drop_first_packet(); } - info("Buffering..."); + disorder_info("Buffering..."); /* Wait until there's at least minbuffer samples available */ while(nsamples < minbuffer) { //fprintf(stderr, "%8u/%u (%u) FILLING\n", nsamples, maxbuffer, minbuffer); @@ -503,6 +515,7 @@ 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 */ @@ -533,6 +546,7 @@ static size_t playrtp_callback(void *buffer, *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 @@ -543,6 +557,7 @@ static size_t playrtp_callback(void *buffer, samples = max_samples; //info("infill by %zu", samples); memset(buffer, 0, samples * uaudio_sample_size); + silent = 1; } /* Debug dump */ if(dump_buffer) { @@ -553,6 +568,45 @@ static size_t playrtp_callback(void *buffer, } /* 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) { + disorder_info("dropping %zu samples (%"PRIu32" > %"PRIu32")", + samples, nsamples, minbuffer); + samples = 0; + } /* Junk obsolete packets */ playrtp_next_packet(); pthread_mutex_unlock(&lock); @@ -579,6 +633,7 @@ int main(int argc, char **argv) { union any_sockaddr mgroup; const char *dumpfile = 0; pthread_t ltid; + int monitor = 0; static const int one = 1; static const struct addrinfo prefs = { @@ -592,9 +647,9 @@ int main(int argc, char **argv) { * timestamps in the logs */ logdate = 1; mem_init(); - if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale"); + if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale"); backend = uaudio_apis[0]; - while((n = getopt_long(argc, argv, "hVdD:m:x:L:R:M:aocC:re:P:", options, 0)) >= 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("disorder-playrtp"); @@ -618,10 +673,11 @@ int main(int argc, char **argv) { case 'r': dumpfile = optarg; break; case 'e': backend = &uaudio_command; uaudio_set("command", optarg); break; case 'P': uaudio_set("pause-mode", optarg); break; - default: fatal(0, "invalid option"); + case 'M': monitor = 1; break; + default: disorder_fatal(0, "invalid option"); } } - if(config_read(0)) fatal(0, "cannot read configuration"); + if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration"); if(!maxbuffer) maxbuffer = 2 * minbuffer; argc -= optind; @@ -644,7 +700,7 @@ int main(int argc, char **argv) { sl.s = argv; break; default: - fatal(0, "usage: disorder-playrtp [OPTIONS] [[ADDRESS] PORT]"); + disorder_fatal(0, "usage: disorder-playrtp [OPTIONS] [[ADDRESS] PORT]"); } /* Look up address and port */ if(!(res = get_address(&sl, &prefs, &sockname))) @@ -653,7 +709,7 @@ int main(int argc, char **argv) { if((rtpfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol)) < 0) - fatal(errno, "error creating socket"); + disorder_fatal(errno, "error creating socket"); /* Allow multiple listeners */ xsetsockopt(rtpfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof one); is_multicast = multicast(res->ai_addr); @@ -671,11 +727,13 @@ int main(int argc, char **argv) { mgroup.in6.sin6_port = 0; break; default: - fatal(0, "unsupported family %d", (int)res->ai_addr->sa_family); + disorder_fatal(0, "unsupported address 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)); + disorder_fatal(errno, "error binding socket to %s", + format_sockaddr(res->ai_addr)); /* Add multicast group membership */ switch(mgroup.sa.sa_family) { case PF_INET: @@ -683,21 +741,21 @@ int main(int argc, char **argv) { 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"); + disorder_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"); + disorder_fatal(errno, "error calling setsockopt IPV6_JOIN_GROUP"); break; default: - fatal(0, "unsupported address family %d", res->ai_family); + disorder_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)); + disorder_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) { @@ -705,9 +763,6 @@ int main(int argc, char **argv) { struct sockaddr_in *in = (struct sockaddr_in *)res->ai_addr; memset(&in->sin_addr, 0, sizeof (struct in_addr)); - if(bind(rtpfd, res->ai_addr, res->ai_addrlen) < 0) - fatal(errno, "error binding socket to 0.0.0.0 port %d", - ntohs(in->sin_port)); break; } case AF_INET6: { @@ -717,35 +772,36 @@ int main(int argc, char **argv) { break; } default: - fatal(0, "unsupported family %d", (int)res->ai_addr->sa_family); + disorder_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)); + disorder_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)); + disorder_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"); + disorder_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); + disorder_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); + disorder_info("changed socket receive buffer from %d to %d", + rcvbuf, target_rcvbuf); } else - info("default socket receive buffer %d", rcvbuf); + disorder_info("default socket receive buffer %d", rcvbuf); //info("minbuffer %u maxbuffer %u", minbuffer, maxbuffer); if(logfp) - info("WARNING: -L option can impact performance"); + disorder_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"); + disorder_fatal(err, "pthread_create control_thread"); } if(dumpfile) { int fd; @@ -753,20 +809,20 @@ int main(int argc, char **argv) { size_t written; if((fd = open(dumpfile, O_RDWR|O_TRUNC|O_CREAT, 0666)) < 0) - fatal(errno, "opening %s", dumpfile); + disorder_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); + disorder_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); + disorder_fatal(errno, "mapping %s", dumpfile); + disorder_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! */ @@ -775,16 +831,17 @@ int main(int argc, char **argv) { 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"); + disorder_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"); + disorder_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..."); + disorder_info("Playing..."); next_timestamp = pheap_first(&packets)->timestamp; active = 1; pthread_mutex_unlock(&lock); @@ -802,6 +859,20 @@ int main(int argc, char **argv) { 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); + disorder_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); }