Changeset 905:2fd9cd5be5ef in roaraudio

Timestamp:

11/28/08 22:24:43 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added --sysclocksync

Location:

roard

Files:

• include/roard.h (modified) (1 diff)
• loop.c (modified) (3 diffs)
• roard.c (modified) (4 diffs)

roard/include/roard.h

@@ -64 +64 @@
 int g_standby;
 
-int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa);
+int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa, int sysclocksync);
 void cleanup_listen_socket (int terminate);
 void clean_quit (void);

roard/loop.c

@@ -25 +25 @@
 #include "roard.h"
 
-int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa) {
+int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa, int sysclocksync) {
  void ** streams_input = NULL;
  int     term = 0;
  int     streams;
+ long int loopc = 0;
+ struct timeval         try, ans;
+ float  freq;
 #ifdef MONITOR_LATENCY
- struct timeval         try, ans;
  long int ans_1last = 0, ans_2last = 0, ans_3last = 0;
- long int loopc = 0;
 
  printf("\n\e[s");
@@ -41 +42 @@
  alive = 1;
  g_pos = 0;
+
+ if ( sysclocksync ) {
+  gettimeofday(&try, NULL);
+ }
 
  while (alive) {
@@ -109 +114 @@
  ans_2last = ans_1last;
  ans_1last = ans.tv_usec;
- loopc++;
 #endif
+
+  if ( ! (loopc % sysclocksync ) ) {
+   gettimeofday(&ans, NULL);
+
+   while (ans.tv_sec > try.tv_sec) {
+    ans.tv_sec--;
+    ans.tv_usec += 1000000;
+   }
+   ans.tv_usec -= try.tv_usec;
+
+
+   freq = (sysclocksync * ROAR_OUTPUT_BUFFER_SAMPLES) / (ans.tv_usec / 1e6);
+   printf("SYNC: f_conf=%iHz, f_real=%.2fHz\n", sa->rate, freq);
+
+//   memcpy(&try, &ans, sizeof(try));
+   gettimeofday(&try, NULL);
+  }
+
+  if ( sysclocksync )
+   loopc++;
  }
 

roard/roard.c

@@ -40 +40 @@
         " --setgid              - GroupID to the audio group as specified via -G\n"
         " --setuid              - UserID to the audio user as specified via -U\n"
+        " --sysclocksync        - calculate exact sample rate using the system clock\n"
        );
 
@@ -116 +117 @@
  int i;
  char * k;
- char user_sock[80] = {0};
+ char user_sock[80]  = {0};
  struct roar_audio_info sa;
- int    daemon   = 0;
- int    realtime = 0;
+ int    daemon       = 0;
+ int    realtime     = 0;
+ int    sysclocksync = 0;
  char * driver = getenv("ROAR_DRIVER");
  char * device = getenv("ROAR_DEVICE");
@@ -204 +206 @@
   } else if ( strcmp(k, "--terminate") == 0 ) {
    g_terminate = 1;
+  } else if ( strcmp(k, "--sysclocksync") == 0 ) {
+   sysclocksync = 1000;
   } else if ( strcmp(k, "--realtime") == 0 ) {
    realtime++;
@@ -463 +467 @@
 
  // start main loop...
- main_loop(drvid, drvinst, &sa);
+ main_loop(drvid, drvinst, &sa, sysclocksync);
 
  // clean up.