Changeset 125:8c29ccfbfa5d in roaraudio

Timestamp:

07/13/08 17:26:52 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

try to work around underrun errors of new streams

Location:

roard

Files:

• include/streams.h (modified) (1 diff)
• streams.c (modified) (2 diffs)

roard/include/streams.h

@@ -24 +24 @@
  struct roar_mixer_settings mixer;
  struct roar_meta meta[ROAR_META_MAX_PER_STREAM];
+ int is_new;
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/streams.c

@@ -50 +50 @@
    ((struct roar_stream_server*)n)->need_extra  = 0;
    ((struct roar_stream_server*)n)->output      = NULL;
+   ((struct roar_stream_server*)n)->is_new      = 1;
    ((struct roar_stream_server*)n)->mixer.scale = 65535;
    for (j = 0; j < ROAR_MAX_CHANNELS; j++)
@@ -360 +361 @@
  if ( todo > 0 ) { // zeroize the rest of teh buffer
   memset(rest, 0, todo);
-  ROAR_ERR("streams_fill_mixbuffer(*): Underrun in stream: %i bytes missing, filling with zeros", todo);
+
+  if ( todo != ROAR_OUTPUT_CALC_OUTBUFSIZE(info) ) {
+   if ( !g_streams[id]->is_new )
+    ROAR_ERR("streams_fill_mixbuffer(*): Underrun in stream: %i bytes missing, filling with zeros", todo);
+
+   g_streams[id]->is_new = 0;
+  }
+ } else {
+  g_streams[id]->is_new = 0;
  }