Changeset 4719:a10929cd0665 in roaraudio

Timestamp:

01/12/11 22:06:28 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some basic latency control

Files:

• include/libroar/vs.h (modified) (1 diff)
• libroar/vs.c (modified) (6 diffs)

include/libroar/vs.h

@@ -266 +266 @@
  ROAR_VS_CMD_GET_FIRST_PRIM,
 #define ROAR_VS_CMD_GET_FIRST_PRIM ROAR_VS_CMD_GET_FIRST_PRIM
+
+ // Latency control:
+ ROAR_VS_CMD_SET_LATC_P,
+#define ROAR_VS_CMD_SET_LATC_P ROAR_VS_CMD_SET_LATC_P
+ ROAR_VS_CMD_GET_LATC_P,
+#define ROAR_VS_CMD_GET_LATC_P ROAR_VS_CMD_GET_LATC_P
+ ROAR_VS_CMD_SET_LATC_TARGET,
+#define ROAR_VS_CMD_SET_LATC_TARGET ROAR_VS_CMD_SET_LATC_TARGET
+ ROAR_VS_CMD_GET_LATC_TARGET,
+#define ROAR_VS_CMD_GET_LATC_TARGET ROAR_VS_CMD_GET_LATC_TARGET
+ ROAR_VS_CMD_SET_LATC_WINDOW,
+#define ROAR_VS_CMD_SET_LATC_WINDOW ROAR_VS_CMD_SET_LATC_WINDOW
+ ROAR_VS_CMD_GET_LATC_WINDOW,
+#define ROAR_VS_CMD_GET_LATC_WINDOW ROAR_VS_CMD_GET_LATC_WINDOW
+ ROAR_VS_CMD_SET_LATC_MINLAG,
+#define ROAR_VS_CMD_SET_LATC_MINLAG ROAR_VS_CMD_SET_LATC_MINLAG
+ ROAR_VS_CMD_GET_LATC_MINLAG,
+#define ROAR_VS_CMD_GET_LATC_MINLAG ROAR_VS_CMD_GET_LATC_MINLAG
 };
 

libroar/vs.c

@@ -36 +36 @@
 #include "libroar.h"
 
+#if defined(ROAR_HAVE_GETSOCKOPT) && defined(ROAR_HAVE_SETSOCKOPT)
+#define _HAVE_SOCKOPT
+#endif
+
 #define FLAG_NONE      0x0000
 #define FLAG_STREAM    0x0001
@@ -64 +68 @@
  struct roar_vio_calls  * file;
  struct roar_buffer     * readring, * writering;
+#ifdef _HAVE_SOCKOPT
+ struct {
+  float target;
+  float window;
+  float minlag;
+  float p;
+ } latc;
+#endif
 };
 
@@ -111 +123 @@
  vss->first_primid = -1;
 
+#ifdef _HAVE_SOCKOPT
+ vss->latc.target = -2.; // must be less than latc.minlag!
+ vss->latc.window = -1.;
+ vss->latc.minlag = -1.;
+ vss->latc.p      =  0.005;
+#endif
+
  return vss;
 }
@@ -662 +681 @@
 }
 
+#ifdef _HAVE_SOCKOPT
+static void roar_vs_latency_managed(roar_vs_t * vss, roar_mus_t lat) {
+ struct roar_vio_sysio_sockopt sockopt;
+ float tmp = ((float)lat/1000.0) - vss->latc.target;
+ int val;
+
+ tmp *= vss->latc.p;
+
+ sockopt.level   = SOL_SOCKET;
+ sockopt.optname = SO_SNDBUF;
+ sockopt.optval  = &val;
+ sockopt.optlen  = sizeof(val);
+
+ roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_GET_SYSIO_SOCKOPT, &sockopt);
+
+ val /= 2;
+
+ tmp = 1.0 - tmp;
+
+ val = (float)val*tmp;
+
+ sockopt.optlen  = sizeof(val);
+
+ roar_vio_ctl(&(vss->vio), ROAR_VIO_CTL_SET_SYSIO_SOCKOPT, &sockopt);
+}
+#endif
+
 roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int * error) {
  ssize_t pos  = roar_vs_position(vss, backend, error);
@@ -717 +763 @@
   _seterr(ROAR_ERROR_NONE);
  }
+
+#ifdef _HAVE_SOCKOPT
+ if (vss->latc.target > vss->latc.minlag) {
+  roar_vs_latency_managed(vss, lag);
+ }
+#endif
 
  return lag;
@@ -1304 +1356 @@
     *(int*)argp = vss->first_primid;
    break;
+#ifdef _HAVE_SOCKOPT
+  case ROAR_VS_CMD_SET_LATC_P:
+    vss->latc.p = *(float*)argp;
+   break;
+  case ROAR_VS_CMD_GET_LATC_P:
+    *(float*)argp = vss->latc.p;
+   break;
+  case ROAR_VS_CMD_SET_LATC_TARGET:
+    vss->latc.target = *(float*)argp;
+   break;
+  case ROAR_VS_CMD_GET_LATC_TARGET:
+    *(float*)argp = vss->latc.target;
+   break;
+  case ROAR_VS_CMD_SET_LATC_WINDOW:
+    vss->latc.window = *(float*)argp;
+   break;
+  case ROAR_VS_CMD_GET_LATC_WINDOW:
+    *(float*)argp = vss->latc.window;
+   break;
+  case ROAR_VS_CMD_SET_LATC_MINLAG:
+    vss->latc.minlag = *(float*)argp;
+   break;
+  case ROAR_VS_CMD_GET_LATC_MINLAG:
+    *(float*)argp = vss->latc.minlag;
+   break;
+#endif
+// use ifndef here so warnings of unhandled enum values will be shown in DEBUG mode.
+#ifndef DEBUG
+  default:
+    return -1;
+   break;
+#endif
  }