Changeset 1137:700c32ffc876 in roaraudio

Timestamp:

01/20/09 21:31:50 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

insert a new parameter for the ss streucture: delay in mu-sec

Files:

• include/libroar/stream.h (modified) (1 diff)
• libroar/stream.c (modified) (2 diffs)
• roarclients/roarctl.c (modified) (1 diff)
• roard/include/streams.h (modified) (1 diff)
• roard/req.c (modified) (2 diffs)
• roard/streams.c (modified) (1 diff)

include/libroar/stream.h

@@ -68 +68 @@
  int flags;
  char * driver;
+ uint_least32_t delay;
 };
 

libroar/stream.c

@@ -276 +276 @@
  }
 
- if ( m.datalen < 6*2 )
+ if ( m.datalen < 7*2 )
   return -1;
 
@@ -289 +289 @@
  info->codec          = data[5];
  info->flags          = data[6];
+ info->delay          = data[7]*1000;
 
  return 0;

roarclients/roarctl.c

@@ -196 +196 @@
     printf("Input block size      : %i Byte\n", info.block_size);
     printf("Underruns pre/post    : %i/%i\n",   info.pre_underruns, info.post_underruns);
+    if ( g_verbose > 1 )
+     printf("Stream delay          : %ims\n",   (int)info.delay/1000);
 
     *flags = 0;

roard/include/streams.h

@@ -58 +58 @@
  struct roardsp_filterchain fc;
  int flags;
+ uint_least32_t delay;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/req.c

@@ -483 +483 @@
  }
 
- mes->datalen = 2*7;
+ mes->datalen = 2*8;
 
  d[2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
@@ -490 +490 @@
  d[5] = ss->codec_orgi;
  d[6] = ss->flags | (ss->primary ? ROAR_FLAG_PRIMARY : 0) | (ss->driver_id != -1 ? ROAR_FLAG_OUTPUT : 0);
+ d[7] = ss->delay/1000;
 
  for (i = 0; i < mes->datalen/2; i++) {

roard/streams.c

@@ -79 +79 @@
    s->pre_underruns   =  0;
    s->post_underruns  =  0;
+   s->delay           =  0;
    s->codec_orgi      = -1;
    s->primary         =  0;