improve new disobedience search code. --choosealpha is dead now

[disorder] / clients / playrtp.c

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 1ed0d938eb1210fdbf01a825f32a02bf6de90da1..8931b6ed7e12b7bb506f2fd0e8be78e00991f223 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -290,10 +290,12 @@ static const struct option options[] = {
   { "min", required_argument, 0, 'm' },
   { "max", required_argument, 0, 'x' },
   { "buffer", required_argument, 0, 'b' },
+  { "rcvbuf", required_argument, 0, 'R' },
+  { "multicast", required_argument, 0, 'M' },
   { 0, 0, 0, 0 }
 };
 
-/** @Brief Return a new packet */
+/** @brief Return a new packet */
 static struct packet *new_packet(void) {
   struct packet *p;
   
@@ -480,6 +482,8 @@ static inline int contains(const struct packet *p, uint32_t timestamp) {
  * Must be called with @ref lock held.
  */
 static void fill_buffer(void) {
+  while(nsamples)
+    drop_first_packet();
   info("Buffering...");
   while(nsamples < readahead)
     pthread_cond_wait(&cond, &lock);
@@ -754,7 +758,10 @@ static void play_rtp(void) {
       info("Playing...");
       /* Keep playing until the buffer empties out, or ALSA tells us to get
        * lost */
-      while(nsamples >= minbuffer && !escape) {
+      while((nsamples >= minbuffer
+             || (nsamples > 0
+                 && contains(pheap_first(&packets), next_timestamp)))
+            && !escape) {
         /* Wait for ALSA to ask us for more data */
         pthread_mutex_unlock(&lock);
         wait_alsa();
@@ -825,7 +832,9 @@ static void play_rtp(void) {
       if(status)
         fatal(0, "AudioDeviceStart: %d", (int)status);
       /* Wait until the buffer empties out */
-      while(nsamples >= minbuffer)
+      while(nsamples >= minbuffer
+            || (nsamples > 0
+                && contains(pheap_first(&packets), next_timestamp)))
         pthread_cond_wait(&cond, &lock);
       /* Stop playing for a bit until the buffer re-fills */
       status = AudioDeviceStop(adid, adioproc);
@@ -849,6 +858,8 @@ static void help(void) {
           "  --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"
+          "  --multicast, -M GROUP   Join multicast group\n"
          "  --help, -h              Display usage message\n"
          "  --version, -V           Display version number\n"
           );
@@ -868,6 +879,11 @@ int main(int argc, char **argv) {
   struct addrinfo *res;
   struct stringlist sl;
   char *sockname;
+  int rcvbuf, target_rcvbuf = 131072;
+  socklen_t len;
+  char *multicast_group = 0;
+  struct ip_mreq mreq;
+  struct ipv6_mreq mreq6;
 
   static const struct addrinfo prefs = {
     AI_PASSIVE,
@@ -882,7 +898,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:", options, 0)) >= 0) {
+  while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
     case 'V': version();
@@ -892,6 +908,8 @@ int main(int argc, char **argv) {
     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;
+    case 'M': multicast_group = optarg; break;
     default: fatal(0, "invalid option");
     }
   }
@@ -912,6 +930,44 @@ int main(int argc, char **argv) {
     fatal(errno, "error creating socket");
   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) {
+    case PF_INET:
+      mreq.imr_multiaddr = ((struct sockaddr_in *)res->ai_addr)->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;
+      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);
+    }
+  }
+  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");
   play_rtp();
   return 0;
 }