shithub: sox

Info  •  Files  •  Log  •  Branches

[1958680] Support more than 32 input files

--- a/src/sox.c

+++ b/src/sox.c

@@ -109,9 +109,7 @@

   rg_mode replay_gain_mode;

 } file_t;

-#define MAX_INPUT_FILES 32

-#define MAX_FILES MAX_INPUT_FILES + 2 /* 1 output file plus record input */

-static file_t * files[MAX_FILES]; /* Array tracking input and output files */

+static file_t * * files; /* Array tracking input and output files */

 #define ofile files[file_count - 1]

 static size_t file_count = 0;

 static size_t input_count = 0;

@@ -397,7 +395,8 @@

 /* The input combiner: contains one sample buffer per input file, but only

  * needed if is_parallel(combine_method) */

 typedef struct {

-  sox_sample_t *ibuf[MAX_INPUT_FILES];

+  sox_sample_t * * ibuf;

+  size_t *         ilen;

 } input_combiner_t;

 static int combiner_start(sox_effect_t *effp)

@@ -409,6 +408,7 @@

     progress_to_next_input_file(files[current_input]);

   else {

     ws = 0;

+    z->ibuf = lsx_malloc(input_count * sizeof(*z->ibuf));

     for (i = 0; i < input_count; i++) {

       z->ibuf[i] = lsx_malloc(sox_globals.bufsiz * sizeof(sox_sample_t));

       progress_to_next_input_file(files[i]);

@@ -416,6 +416,7 @@

     }

     input_wide_samples = ws; /* Output length is that of longest input file. */

   }

+  z->ilen = lsx_malloc(input_count * sizeof(*z->ilen));

   return SOX_SUCCESS;

 }

@@ -430,7 +431,6 @@

 {

   input_combiner_t * z = (input_combiner_t *) effp->priv;

   size_t ws, s, i;

-  size_t ilen[MAX_INPUT_FILES];

   size_t olen = 0;

   if (is_serial(combine_method)) {

@@ -451,9 +451,9 @@

   } /* is_serial */ else { /* else is_parallel() */

     sox_sample_t * p = obuf;

     for (i = 0; i < input_count; ++i) {

-      ilen[i] = sox_read_wide(files[i]->ft, z->ibuf[i], *osamp);

-      balance_input(z->ibuf[i], ilen[i], files[i]);

-      olen = max(olen, ilen[i]);

+      z->ilen[i] = sox_read_wide(files[i]->ft, z->ibuf[i], *osamp);

+      balance_input(z->ibuf[i], z->ilen[i], files[i]);

+      olen = max(olen, z->ilen[i]);

     }

     for (ws = 0; ws < olen; ++ws) { /* wide samples */

       if (combine_method == sox_mix || combine_method == sox_mix_power) {

@@ -460,7 +460,7 @@

         for (s = 0; s < effp->in_signal.channels; ++s, ++p) { /* sum samples */

           *p = 0;

           for (i = 0; i < input_count; ++i)

-            if (ws < ilen[i] && s < files[i]->ft->signal.channels) {

+            if (ws < z->ilen[i] && s < files[i]->ft->signal.channels) {

               /* Cast to double prevents integer overflow */

               double sample = *p + (double)z->ibuf[i][ws * files[i]->ft->signal.channels + s];

               *p = SOX_ROUND_CLIP_COUNT(sample, mixing_clips);

@@ -469,10 +469,10 @@

       } /* sox_mix */ else if (combine_method == sox_multiply)  {

         for (s = 0; s < effp->in_signal.channels; ++s, ++p) { /* multiple samples */

           i = 0;

-          *p = ws < ilen[i] && s < files[i]->ft->signal.channels?

+          *p = ws < z->ilen[i] && s < files[i]->ft->signal.channels?

             z->ibuf[i][ws * files[i]->ft->signal.channels + s] : 0;

           for (++i; i < input_count; ++i) {

-            double sample = *p * (-1. / SOX_SAMPLE_MIN) * (ws < ilen[i] && s < files[i]->ft->signal.channels? z->ibuf[i][ws * files[i]->ft->signal.channels + s] : 0);

+            double sample = *p * (-1. / SOX_SAMPLE_MIN) * (ws < z->ilen[i] && s < files[i]->ft->signal.channels? z->ibuf[i][ws * files[i]->ft->signal.channels + s] : 0);

             *p = SOX_ROUND_CLIP_COUNT(sample, mixing_clips);

           }

         }

@@ -479,7 +479,7 @@

       } /* sox_multiply */ else { /* sox_merge: like a multi-track recorder */

         for (i = 0; i < input_count; ++i)

           for (s = 0; s < files[i]->ft->signal.channels; ++s)

-            *p++ = (ws < ilen[i]) * z->ibuf[i][ws * files[i]->ft->signal.channels + s];

+            *p++ = (ws < z->ilen[i]) * z->ibuf[i][ws * files[i]->ft->signal.channels + s];

       } /* sox_merge */

     } /* wide samples */

     current_input += input_count;

@@ -1974,14 +1974,11 @@

 {

   file_t * f = lsx_malloc(sizeof(*f));

-  if (file_count >= MAX_FILES) {

-    sox_fail("too many files; maximum is %d input files (and 1 output file)", MAX_INPUT_FILES);

-    exit(1);

-  }

   *f = *opts;

   if (!filename)

     usage("missing filename"); /* No return */

   f->filename = lsx_strdup(filename);

+  files = lsx_realloc(files, (file_count + 1) * sizeof(*files));

   files[file_count++] = f;

   return 0;

 }