Changeset 4111:ea89fa7723d6 in roaraudio for roard

Timestamp:

08/06/10 16:39:18 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

experimental patch from maister for resampling

Location:

roard

Files:

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

roard/include/output.h

@@ -52 +52 @@
 #define ROAR_OUTPUT_WRITE_SIZE     1024
 
-#define ROAR_OUTPUT_CALC_OUTBUFSIZE(x)   (ROAR_OUTPUT_BUFFER_SAMPLES * (x)->channels * ((x)->bits / 8) * ((float)(x)->rate/g_sa->rate))
+//#define ROAR_OUTPUT_CALC_OUTBUFSIZE(x)   (ROAR_OUTPUT_BUFFER_SAMPLES * (x)->channels * ((x)->bits / 8) * ((float)(x)->rate/g_sa->rate))
+// First rounds the samples count, and makes sure that the outbuffer size is divisible by the framesize (channels * bits/8)
+#define ROAR_OUTPUT_CALC_OUTBUFSIZE(x)   ( \
+                                          ( \
+                                           (int)(ROAR_OUTPUT_BUFFER_SAMPLES * ((float)(x)->rate/g_sa->rate) + 0.5) \
+                                          ) * \
+                                          (x)->channels * ((x)->bits / 8) \
+                                         )
+
 #define ROAR_OUTPUT_CALC_OUTBUFSAMP(x,y) ((y) / ((x)->channels * ((x)->bits / 8)*((float)(x)->rate/g_sa->rate)))
 #define ROAR_OUTPUT_CALC_OUTBUFSIZE_MAX(x0,x1)  (ROAR_OUTPUT_BUFFER_SAMPLES                                  * \

roard/streams.c

@@ -1165 +1165 @@
 //  if ( roar_conv(outdata, indata, (8*inlen_got*info->rate)/(stream_info->rate * stream_info->bits), stream_info, info) == -1 ) {
   ROAR_DBG("streams_fill_mixbuffer2(*): CALL roar_conv2(*)...");
-  if ( roar_conv2(bufdata, indata, inlen, stream_info, info, buflen) == -1 ) {
+  if ( roar_conv2(bufdata, indata, inlen, stream_info, info, outlen) == -1 ) {
    if ( bufbuf != NULL )
     roar_buffer_free(bufbuf);