Support global prefs through eclient interface.

[disorder] / lib / resample.c

diff --git a/lib/resample.c b/lib/resample.c
index a6498dd4180e77ecd54e75213de1447892e0ce3b..39514ed37c3cf6497ba05a1e530053932db39d57 100644 (file)
--- a/lib/resample.c
+++ b/lib/resample.c
@@ -82,9 +82,9 @@ void resample_init(struct resampler *rs,
     int error_;
     rs->state = src_new(SRC_SINC_BEST_QUALITY, rs->output_channels, &error_);
     if(!rs->state)
     int error_;
     rs->state = src_new(SRC_SINC_BEST_QUALITY, rs->output_channels, &error_);
     if(!rs->state)

-      fatal(0, "calling src_new: %s", src_strerror(error_));
+      disorder_fatal(0, "calling src_new: %s", src_strerror(error_));

 #else
 #else

-    fatal(0, "need to resample audio data but libsamplerate not available");
+    disorder_fatal(0, "need to resample audio data but libsamplerate not available");

 #endif
   }
 }
 #endif
   }
 }


@@ -214,10 +214,8 @@ static size_t resample_put_sample(const struct resampler *rs,
  */
 static void resample_prepare_input(const struct resampler *rs,
                                    const uint8_t *bytes,
  */
 static void resample_prepare_input(const struct resampler *rs,
                                    const uint8_t *bytes,

-                                   size_t nbytes,
+                                   size_t nframes,

                                    float *floats) {
                                    float *floats) {

-  size_t nframes = nbytes / (rs->input_bytes_per_frame);
-

   while(nframes > 0) {
     int n;
 
   while(nframes > 0) {
     int n;
 


@@ -261,11 +259,12 @@ size_t resample_convert(const struct resampler *rs,
   float *input = xcalloc(nframesin * rs->output_channels, sizeof (float));
   float *output = 0;
 
   float *input = xcalloc(nframesin * rs->output_channels, sizeof (float));
   float *output = 0;
 

-  resample_prepare_input(rs, bytes, nbytes, input);
+  resample_prepare_input(rs, bytes, nframesin, input);

 #if HAVE_SAMPLERATE_H
   if(rs->state) {
     /* A sample-rate conversion must be performed */
     SRC_DATA data;
 #if HAVE_SAMPLERATE_H
   if(rs->state) {
     /* A sample-rate conversion must be performed */
     SRC_DATA data;

+    memset(&data, 0, sizeof data);

     /* Compute how many frames are expected to come out. */
     size_t maxframesout = nframesin * rs->output_rate / rs->input_rate + 1;
     output = xcalloc(maxframesout * rs->output_channels, sizeof(float));
     /* Compute how many frames are expected to come out. */
     size_t maxframesout = nframesin * rs->output_rate / rs->input_rate + 1;
     output = xcalloc(maxframesout * rs->output_channels, sizeof(float));


@@ -274,12 +273,17 @@ size_t resample_convert(const struct resampler *rs,
     data.input_frames = nframesin;
     data.output_frames = maxframesout;
     data.end_of_input = eof;
     data.input_frames = nframesin;
     data.output_frames = maxframesout;
     data.end_of_input = eof;

-    data.src_ratio = rs->output_rate / rs->input_rate;
+    data.src_ratio = (double)rs->output_rate / rs->input_rate;
+    D(("nframesin=%zu maxframesout=%zu eof=%d ratio=%d.%06d",
+       nframesin, maxframesout, eof,
+       (int)data.src_ratio,
+       ((int)(data.src_ratio * 1000000) % 1000000)));

     int error_ = src_process(rs->state, &data);
     if(error_)
     int error_ = src_process(rs->state, &data);
     if(error_)

-      fatal(0, "calling src_process: %s", src_strerror(error_));
+      disorder_fatal(0, "calling src_process: %s", src_strerror(error_));

     nframesin = data.input_frames_used;
     nsamplesout = data.output_frames_gen * rs->output_channels;
     nframesin = data.input_frames_used;
     nsamplesout = data.output_frames_gen * rs->output_channels;

+    D(("new nframesin=%zu nsamplesout=%zu", nframesin, nsamplesout));

   }
 #endif
   if(!output) {
   }
 #endif
   if(!output) {


@@ -303,6 +307,7 @@ size_t resample_convert(const struct resampler *rs,
   xfree(input);
   eof = 0;             /* quieten compiler */
   /* Report how many input bytes were actually consumed */
   xfree(input);
   eof = 0;             /* quieten compiler */
   /* Report how many input bytes were actually consumed */

+  //fprintf(stderr, "converted %zu frames\n", nframesin);

   return nframesin * rs->input_bytes_per_frame;
 }
 
   return nframesin * rs->input_bytes_per_frame;
 }