Changeset 388:21a4e03ca575 in roaraudio

Timestamp:

08/06/08 14:58:36 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some more debuging lines, use rates not mul and div to calc outlen

File:

• roard/streams.c (modified) (4 diffs)

roard/streams.c

@@ -227 +227 @@
 
  // calc todo_in
- todo_in = ROAR_OUTPUT_CALC_OUTBUFSIZE(stream_info);
+ todo_in = (todo*stream_info->rate)/info->rate;
+// todo_in = ROAR_OUTPUT_CALC_OUTBUFSIZE(stream_info);
 
  // calc mul and div:
@@ -315 +316 @@
 
   // calc how much outlen this has...
-  outlen = (len * mul) / div;
+//  outlen = (len * mul) / div;
+  outlen = (len * info->rate)/stream_info->rate;
 
   ROAR_DBG("streams_fill_mixbuffer(*): outlen = %i, buf = %p, len = %i", outlen, in, len);
@@ -361 +363 @@
   // hey! we have roar_conv() :)
 
-  if ( roar_conv(rest, in, 8*len / stream_info->bits, stream_info, info) == -1 )
-   return -1;
-  }
-
-  if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(((struct roar_stream_server*)g_streams[id])->mixer)) == -1 )
-   return -1;
+   if ( roar_conv(rest, in, 8*len / stream_info->bits, stream_info, info) == -1 ) {
+    ROAR_WARN("streams_fill_mixbuffer(*): can not convert input!");
+    return -1;
+   }
+
+   if ( change_vol(rest, info->bits, rest, 8*outlen / info->bits, info->channels, &(((struct roar_stream_server*)g_streams[id])->mixer)) == -1 ) {
+    ROAR_WARN("streams_fill_mixbuffer(*): can not change volume");
+    return -1;
+   }
 
   // we habe outlen bytes more...
-  todo    -= outlen;
-  rest    += outlen;
-  todo_in -= len;
-
-  roar_buffer_get_len(buf, &len);
-  ROAR_DBG("streams_fill_mixbuffer(*): New length of buffer %p is %i", buf, len);
-  if ( len == 0 ) {
-   roar_buffer_delete(buf, NULL);
-  } else {
-   stream_unshift_buffer(id, buf);
+   todo    -= outlen;
+   rest    += outlen;
+   todo_in -= len;
+
+   roar_buffer_get_len(buf, &len);
+   ROAR_DBG("streams_fill_mixbuffer(*): New length of buffer %p is %i", buf, len);
+   if ( len == 0 ) {
+    roar_buffer_delete(buf, NULL);
+   } else {
+    stream_unshift_buffer(id, buf);
+   }
   }
  }
@@ -412 +418 @@
  return 0;
 }
-
 
 int streams_get_mixbuffers (void *** bufferlist, struct roar_audio_info * info, unsigned int pos) {