sigrid/sox · Ink

src/bend.c+3−2

     char *str;           /* Command-line argument to parse for this bend */
     size_t start;        /* Start bending when in_pos equals this */
     double cents;
-    size_t duration;     /* Number of samples to bend */
+    uint64_t duration;     /* Number of samples to bend */
   } *bends;
   unsigned frame_rate;
 static int parse(sox_effect_t * effp, char **argv, sox_rate_t rate)
 {
   priv_t *p = (priv_t *) effp->priv;
-  size_t i, time = 0, delay;
+  size_t i;
+  uint64_t time = 0, delay;
   char const *next;
   for (i = 0; i < p->nbends; ++i) {

src/crop.c+2−2

@@ -32,7 +32,7 @@ static int parse(sox_effect_t * effp, char * * argv, sox_rate_t rate) · 31 unmodified lines
32	{	32	{
33	priv_t * p = (priv_t *)effp->priv;	33	priv_t * p = (priv_t *)effp->priv;
34	char const * s, * q;	34	char const * s, * q;
35	size_t samples;	35	uint64_t samples;
36	int i;	36	int i;
37		37
38	for (i = p->argc - 1; i == 0 \|\| i == 1; --i) {	38	for (i = p->argc - 1; i == 0 \|\| i == 1; --i) {
@@ -105,7 +105,7 @@ static int flow(sox_effect_t * effp, sox_sample_t const * ibuf, · 66 unmodified lines
105	sox_sample_t * obuf, size_t * isamp, size_t * osamp)	105	sox_sample_t * obuf, size_t * isamp, size_t * osamp)
106	{	106	{
107	priv_t * p = (priv_t *)effp->priv;	107	priv_t * p = (priv_t *)effp->priv;
108	size_t skipped;	108	uint64_t skipped;
109		109
110	p->pos[0].at -= skipped = min(p->pos[0].at, *isamp);	110	p->pos[0].at -= skipped = min(p->pos[0].at, *isamp);
111	osamp = !p->pos[0].at min(p->pos[1].at, min(isamp - skipped, osamp));	111	osamp = !p->pos[0].at min(p->pos[1].at, min(isamp - skipped, osamp));

src/delay.c+5−4

 typedef struct {
   size_t argc;
   char * * argv, * max_arg;
-  size_t delay, pre_pad, pad, buffer_size, buffer_index;
+  uint64_t delay, pre_pad, pad;
+  size_t buffer_size, buffer_index;
   sox_sample_t * buffer;
   sox_bool drain_started;
 } priv_t;
 static int create(sox_effect_t * effp, int argc, char * * argv)
 {
   priv_t * p = (priv_t *)effp->priv;
-  size_t delay, max_samples = 0;
+  uint64_t delay, max_samples = 0;
   unsigned i;
   --argc, ++argv;
 static int start(sox_effect_t * effp)
 {
   priv_t * p = (priv_t *)effp->priv;
-  size_t max_delay;
+  uint64_t max_delay;
   if (!p->max_arg)
     return SOX_EFF_NULL;
     lsx_parsesamples(effp->in_signal.rate, p->argv[effp->flow], &p->buffer_size, 't');
   lsx_parsesamples(effp->in_signal.rate, p->max_arg, &max_delay, 't');
   if (effp->flow == 0)
-    lsx_debug("extending audio by %" PRIuPTR " samples", max_delay);
+    lsx_debug("extending audio by %" PRIu64 " samples", max_delay);
   p->buffer_index = p->delay = p->pre_pad = 0;
   p->pad = max_delay - p->buffer_size;
   p->buffer = lsx_malloc(p->buffer_size * sizeof(*p->buffer));

src/effects.c+7−7

@@ -397,20 +397,20 @@ int sox_flow_effects(sox_effects_chain_t * chain, int (* callback)(sox_bool all_ · 396 unmodified lines
397	return flow_status;	397	return flow_status;
398	}	398	}
399		399
400	size_t sox_effects_clips(sox_effects_chain_t * chain)	400	uint64_t sox_effects_clips(sox_effects_chain_t * chain)
401	{	401	{
402	unsigned i, f;	402	unsigned i, f;
403	size_t clips = 0;	403	uint64_t clips = 0;
404	for (i = 1; i < chain->length - 1; ++i)	404	for (i = 1; i < chain->length - 1; ++i)
405	for (f = 0; f < chain->effects[i][0].flows; ++f)	405	for (f = 0; f < chain->effects[i][0].flows; ++f)
406	clips += chain->effects[i][f].clips;	406	clips += chain->effects[i][f].clips;
407	return clips;	407	return clips;
408	}	408	}
409		409
410	size_t sox_stop_effect(sox_effect_t *effp)	410	uint64_t sox_stop_effect(sox_effect_t *effp)
411	{	411	{
412	unsigned f;	412	unsigned f;
413	size_t clips = 0;	413	uint64_t clips = 0;
414		414
415	for (f = 0; f < effp->flows; ++f) {	415	for (f = 0; f < effp->flows; ++f) {
416	effp[f].handler.stop(&effp[f]);	416	effp[f].handler.stop(&effp[f]);
@@ -451,12 +451,12 @@ sox_effect_t sox_pop_effect_last(sox_effects_chain_t chain) · 34 unmodified lines
451	*/	451	*/
452	void sox_delete_effect(sox_effect_t *effp)	452	void sox_delete_effect(sox_effect_t *effp)
453	{	453	{
454	size_t clips;	454	uint64_t clips;
455	unsigned f;	455	unsigned f;
456		456
457	if ((clips = sox_stop_effect(effp)) != 0)	457	if ((clips = sox_stop_effect(effp)) != 0)
458	lsx_warn("%s clipped %lu samples; decrease volume?",	458	lsx_warn("%s clipped %" PRIu64 " samples; decrease volume?",
459	effp->handler.name, (unsigned long)clips);	459	effp->handler.name, clips);
460	effp->handler.kill(effp); /* N.B. only one kill; not one per flow */	460	effp->handler.kill(effp); /* N.B. only one kill; not one per flow */
461	for (f = 0; f < effp->flows; ++f)	461	for (f = 0; f < effp->flows; ++f)
462	free(effp[f].priv);	462	free(effp[f].priv);

src/effects_i.c+2−2

@@ -145,7 +145,7 @@ void lsx_generate_wave_table( · 144 unmodified lines
145	* # of samples.	145	* # of samples.
146	* Returns NULL on error, pointer to next char to parse otherwise.	146	* Returns NULL on error, pointer to next char to parse otherwise.
147	*/	147	*/
148	char const * lsx_parsesamples(sox_rate_t rate, const char str0, size_t samples, int def)	148	char const * lsx_parsesamples(sox_rate_t rate, const char str0, uint64_t samples, int def)
149	{	149	{
150	int i, found_samples = 0, found_time = 0;	150	int i, found_samples = 0, found_time = 0;
151	char const * end;	151	char const * end;
@@ -214,7 +214,7 @@ char const * lsx_parsesamples(sox_rate_t rate, const char str0, size_t samples · 62 unmodified lines
214	int main(int argc, char * * argv)	214	int main(int argc, char * * argv)
215	{	215	{
216	char const * str, * next;	216	char const * str, * next;
217	size_t samples;	217	uint64_t samples;
218		218
219	TEST("0" , 0, 1)	219	TEST("0" , 0, 1)
220	TEST("1" , 10000, 1)	220	TEST("1" , 10000, 1)

src/fade.c+6−4

     priv_t * fade = (priv_t *) effp->priv;
     char t_char[2];
     int t_argno;
-    size_t samples;
+    uint64_t samples;
     const char *n;
   --argc, ++argv;
 {
     priv_t * fade = (priv_t *) effp->priv;
     sox_bool truncate = sox_false;
-    size_t samples;
+    uint64_t samples;
     /* converting time values to samples */
     fade->in_start = 0;
     fade->samplesdone = fade->in_start;
     fade->endpadwarned = 0;
-    lsx_debug("in_start = %lu in_stop = %lu out_start = %lu out_stop = %lu", (unsigned long)fade->in_start, (unsigned long)fade->in_stop, (unsigned long)fade->out_start, (unsigned long)fade->out_stop);
+    lsx_debug("in_start = %" PRIu64 " in_stop = %" PRIu64 " "
+      "out_start = %" PRIu64 " out_stop = %" PRIu64,
+      fade->in_start, fade->in_stop, fade->out_start, fade->out_stop);
     if (fade->in_start == fade->in_stop && !truncate &&
         fade->out_start == fade->out_stop)
     if (fade->do_out && fade->samplesdone < fade->out_stop &&
         !(fade->endpadwarned))
     { /* Warning about padding silence into end of sample */
-        lsx_warn("Fade: warning: End time passed end-of-file. Padding with silence");
+        lsx_warn("End time past end of audio. Padding with silence");
         fade->endpadwarned = 1;
     } /* endif endpadwarned */

src/oss.c+1−1

@@ -204,7 +204,7 @@ static int ossinit(sox_format_t * ft) · 203 unmodified lines
204	file->size = 0;	204	file->size = 0;
205	ioctl (fileno(ft->fp), SNDCTL_DSP_GETBLKSIZE, &file->size);	205	ioctl (fileno(ft->fp), SNDCTL_DSP_GETBLKSIZE, &file->size);
206	if (file->size < 4 \|\| file->size > 65536) {	206	if (file->size < 4 \|\| file->size > 65536) {
207	lsx_fail_errno(ft,SOX_EOF,"Invalid audio buffer size %lu", (unsigned long)file->size);	207	lsx_fail_errno(ft,SOX_EOF,"Invalid audio buffer size %" PRIuPTR, file->size);
208	return (SOX_EOF);	208	return (SOX_EOF);
209	}	209	}
210	file->count = 0;	210	file->count = 0;

src/pad.c+6−6

@@ -21,13 +21,13 @@ typedef struct { · 20 unmodified lines
21	unsigned npads; /* Number of pads requested */	21	unsigned npads; /* Number of pads requested */
22	struct {	22	struct {
23	char * str; /* Command-line argument to parse for this pad */	23	char * str; /* Command-line argument to parse for this pad */
24	size_t start; /* Start padding when in_pos equals this */	24	uint64_t start; /* Start padding when in_pos equals this */
25	size_t pad; /* Number of samples to pad */	25	uint64_t pad; /* Number of samples to pad */
26	} * pads;	26	} * pads;
27		27
28	size_t in_pos; /* Number of samples read from the input stream */	28	uint64_t in_pos; /* Number of samples read from the input stream */
29	unsigned pads_pos; /* Number of pads completed so far */	29	unsigned pads_pos; /* Number of pads completed so far */
30	size_t pad_pos; /* Number of samples through the current pad */	30	uint64_t pad_pos; /* Number of samples through the current pad */
31	} priv_t;	31	} priv_t;
32		32
33	static int parse(sox_effect_t * effp, char * * argv, sox_rate_t rate)	33	static int parse(sox_effect_t * effp, char * * argv, sox_rate_t rate)
@@ -42,7 +42,7 @@ static int parse(sox_effect_t * effp, char * * argv, sox_rate_t rate) · 8 unmodified lines
42	next = lsx_parsesamples(rate, p->pads[i].str, &p->pads[i].pad, 't');	42	next = lsx_parsesamples(rate, p->pads[i].str, &p->pads[i].pad, 't');
43	if (next == NULL) break;	43	if (next == NULL) break;
44	if (*next == '\0')	44	if (*next == '\0')
45	p->pads[i].start = i? SOX_SIZE_MAX : 0;	45	p->pads[i].start = i? UINT64_MAX : 0;
46	else {	46	else {
47	if (*next != '@') break;	47	if (*next != '@') break;
48	next = lsx_parsesamples(rate, next+1, &p->pads[i].start, 't');	48	next = lsx_parsesamples(rate, next+1, &p->pads[i].start, 't');
@@ -118,7 +118,7 @@ static int drain(sox_effect_t * effp, sox_sample_t * obuf, size_t * osamp) · 69 unmodified lines
118	priv_t * p = (priv_t *)effp->priv;	118	priv_t * p = (priv_t *)effp->priv;
119	static size_t isamp = 0;	119	static size_t isamp = 0;
120	if (p->pads_pos != p->npads && p->in_pos != p->pads[p->pads_pos].start)	120	if (p->pads_pos != p->npads && p->in_pos != p->pads[p->pads_pos].start)
121	p->in_pos = SOX_SIZE_MAX; /* Invoke the final pad (with no given start) */	121	p->in_pos = UINT64_MAX; /* Invoke the final pad (with no given start) */
122	return flow(effp, 0, obuf, &isamp, osamp);	122	return flow(effp, 0, obuf, &isamp, osamp);
123	}	123	}
124		124

src/repeat.c+2−2

@@ -20,7 +20,7 @@ · 19 unmodified lines
20		20
21	typedef struct {	21	typedef struct {
22	unsigned num_repeats, remaining_repeats;	22	unsigned num_repeats, remaining_repeats;
23	off_t num_samples, remaining_samples;	23	uint64_t num_samples, remaining_samples;
24	FILE * tmp_file;	24	FILE * tmp_file;
25	} priv_t;	25	} priv_t;
26		26
@@ -74,7 +74,7 @@ static int drain(sox_effect_t * effp, sox_sample_t * obuf, size_t * osamp) · 47 unmodified lines
74	--p->remaining_repeats;	74	--p->remaining_repeats;
75	rewind(p->tmp_file);	75	rewind(p->tmp_file);
76	}	76	}
77	n = min(p->remaining_samples, (off_t)(*osamp - odone));	77	n = min(p->remaining_samples, *osamp - odone);
78	if ((fread(obuf + odone, sizeof(*obuf), n, p->tmp_file)) != n) {	78	if ((fread(obuf + odone, sizeof(*obuf), n, p->tmp_file)) != n) {
79	lsx_fail("error reading temporary file: %s", strerror(errno));	79	lsx_fail("error reading temporary file: %s", strerror(errno));
80	return SOX_EOF;	80	return SOX_EOF;

src/sox.c+15−14

   sox_bool no_glob;
   sox_format_t * ft;  /* libSoX file descriptor */
-  size_t volume_clips;
+  uint64_t volume_clips;
   rg_mode replay_gain_mode;
 } file_t;
 static sox_signalinfo_t combiner_signal, ofile_signal_options;
 static sox_encodinginfo_t combiner_encoding, ofile_encoding_options;
-static size_t mixing_clips = 0;
+static uint64_t mixing_clips = 0;
 static size_t current_input = 0;
 static uint64_t input_wide_samples = 0;
 static uint64_t read_wide_samples = 0;
     uint64_t ws = ft->signal.length / ft->signal.channels;
     char const * text, * text2 = NULL;
     fprintf(output,
-        "Duration       : %s = %lu samples %c %g CDDA sectors\n",
+        "Duration       : %s = %" PRIu64 " samples %c %g CDDA sectors\n",
         str_time((double)ws / ft->signal.rate),
-        (unsigned long)ws, "~="[ft->signal.rate == 44100],
+        ws, "~="[ft->signal.rate == 44100],
         (double)ws / ft->signal.rate * 44100 / 588);
     if (ft->mode == 'r' && (text = size_and_bitrate(ft, &text2))) {
       fprintf(output, "File Size      : %s\n", text);
 static int combiner_start(sox_effect_t *effp)
 {
   input_combiner_t * z = (input_combiner_t *) effp->priv;
-  size_t ws, i;
+  uint64_t ws;
+  size_t i;
   if (is_serial(combine_method))
     progress_to_next_input_file(files[current_input], effp);
   return SOX_SUCCESS;
 } /* advance_eff_chain */
-static size_t total_clips(void)
+static uint64_t total_clips(void)
 {
   unsigned i;
-  size_t clips = 0;
+  uint64_t clips = 0;
   for (i = 0; i < file_count; ++i)
     clips += files[i]->ft->clips + files[i]->volume_clips;
   return clips + mixing_clips + sox_effects_clips(effects_chain);
     case Type: printf("%s\n", ft->filetype); break;
     case Rate: printf("%g\n", ft->signal.rate); break;
     case Channels: printf("%u\n", ft->signal.channels); break;
-    case Samples: if (soxi_total ==-1) printf("%lu\n",(unsigned long)ws); break;
+    case Samples: if (soxi_total ==-1) printf("%" PRIu64 "\n", ws); break;
     case Duration: if (soxi_total ==-1) printf("%s\n", str_time(secs)); break;
     case Duration_secs: if (soxi_total ==-1) printf("%f\n", secs); break;
     case Bits: printf("%u\n", ft->encoding.bits_per_sample); break;
   for (i = 0; i < file_count; ++i)
     if (files[i]->ft->clips != 0)
-      lsx_warn(i < input_count?"`%s' input clipped %lu samples" :
+      lsx_warn(i < input_count?"`%s' input clipped %" PRIu64 " samples" :
-                              "`%s' output clipped %lu samples; decrease volume?",
+                              "`%s' output clipped %" PRIu64 " samples; decrease volume?",
           (files[i]->ft->handler.flags & SOX_FILE_DEVICE)?
                        files[i]->ft->handler.names[0] : files[i]->ft->filename,
-          (unsigned long)files[i]->ft->clips);
+          files[i]->ft->clips);
   if (mixing_clips > 0)
-    lsx_warn("mix-combining clipped %lu samples; decrease volume?", (unsigned long)mixing_clips);
+    lsx_warn("mix-combining clipped %" PRIu64 " samples; decrease volume?", mixing_clips);
   for (i = 0; i < file_count; i++)
     if (files[i]->volume_clips > 0)
-      lsx_warn("`%s' balancing clipped %lu samples; decrease volume?",
+      lsx_warn("`%s' balancing clipped %" PRIu64 " samples; decrease volume?",
-          files[i]->filename, (unsigned long)files[i]->volume_clips);
+          files[i]->filename, files[i]->volume_clips);
   if (show_progress) {
     if (user_abort)

src/sox.h+5−5

src/sox_i.h+1−1

@@ -73,7 +73,7 @@ void lsx_generate_wave_table( · 72 unmodified lines
73	double min, /* Minimum value on the y-axis. (e.g. -1) */	73	double min, /* Minimum value on the y-axis. (e.g. -1) */
74	double max, /* Maximum value on the y-axis. (e.g. +1) */	74	double max, /* Maximum value on the y-axis. (e.g. +1) */
75	double phase); /* Phase at 1st point; 0..2pi. (e.g. pi/2 for cosine) */	75	double phase); /* Phase at 1st point; 0..2pi. (e.g. pi/2 for cosine) */
76	char const * lsx_parsesamples(sox_rate_t rate, const char str, size_t samples, int def);	76	char const * lsx_parsesamples(sox_rate_t rate, const char str, uint64_t samples, int def);
77	int lsx_parse_note(char const * text, char * * end_ptr);	77	int lsx_parse_note(char const * text, char * * end_ptr);
78	double lsx_parse_frequency_k(char const * text, char * * end_ptr, int key);	78	double lsx_parse_frequency_k(char const * text, char * * end_ptr, int key);
79	#define lsx_parse_frequency(a, b) lsx_parse_frequency_k(a, b, INT_MAX)	79	#define lsx_parse_frequency(a, b) lsx_parse_frequency_k(a, b, INT_MAX)

src/spectrogram.c+2−2

@@ -56,7 +56,7 @@ typedef struct { · 55 unmodified lines
56		56
57	/* Per-channel work area */	57	/* Per-channel work area */
58	int WORK; /* Start of work area is marked by this dummy variable. */	58	int WORK; /* Start of work area is marked by this dummy variable. */
59	size_t skip;	59	uint64_t skip;
60	int dft_size, step_size, block_steps, block_num, rows, cols, read;	60	int dft_size, step_size, block_steps, block_num, rows, cols, read;
61	int x_size, end, end_min, last_end;	61	int x_size, end, end_min, last_end;
62	sox_bool truncated;	62	sox_bool truncated;
@@ -92,7 +92,7 @@ static unsigned char const alt_palette[] = · 29 unmodified lines
92	static int getopts(sox_effect_t * effp, int argc, char **argv)	92	static int getopts(sox_effect_t * effp, int argc, char **argv)
93	{	93	{
94	priv_t * p = (priv_t *)effp->priv;	94	priv_t * p = (priv_t *)effp->priv;
95	size_t duration;	95	uint64_t duration;
96	char const * next;	96	char const * next;
97	int c;	97	int c;
98	lsx_getopt_t optstate;	98	lsx_getopt_t optstate;

src/splice.c+8−8

src/stat.c+2−2

@@ -25,7 +25,7 @@ typedef struct { · 24 unmodified lines
25	double dsum1, dsum2; /* deltas */	25	double dsum1, dsum2; /* deltas */
26	double scale; /* scale-factor */	26	double scale; /* scale-factor */
27	double last; /* previous sample */	27	double last; /* previous sample */
28	size_t read; /* samples processed */	28	uint64_t read; /* samples processed */
29	int volume;	29	int volume;
30	int srms;	30	int srms;
31	int fft;	31	int fft;
@@ -265,7 +265,7 @@ static int sox_stat_stop(sox_effect_t * effp) · 233 unmodified lines
265	if (stat->volume == 2)	265	if (stat->volume == 2)
266	fprintf(stderr, "\n\n");	266	fprintf(stderr, "\n\n");
267	/* print out the info */	267	/* print out the info */
268	fprintf(stderr, "Samples read: %12lu\n", (unsigned long)stat->read);	268	fprintf(stderr, "Samples read: %12" PRIu64 "\n", stat->read);
269	fprintf(stderr, "Length (seconds): %12.6f\n", (double)stat->read/effp->in_signal.rate/effp->in_signal.channels);	269	fprintf(stderr, "Length (seconds): %12.6f\n", (double)stat->read/effp->in_signal.rate/effp->in_signal.channels);
270	if (stat->srms)	270	if (stat->srms)
271	fprintf(stderr, "Scaled by rms: %12.6f\n", rms);	271	fprintf(stderr, "Scaled by rms: %12.6f\n", rms);

src/synth.c+4−4

@@ -186,8 +186,8 @@ typedef struct { · 185 unmodified lines
186	char * length_str;	186	char * length_str;
187	channel_t * getopts_channels;	187	channel_t * getopts_channels;
188	size_t getopts_nchannels;	188	size_t getopts_nchannels;
189	size_t samples_done;	189	uint64_t samples_done;
190	size_t samples_to_do;	190	uint64_t samples_to_do;
191	channel_t * channels;	191	channel_t * channels;
192	size_t number_of_channels;	192	size_t number_of_channels;
193	sox_bool no_headroom;	193	sox_bool no_headroom;
@@ -514,11 +514,11 @@ static int start(sox_effect_t * effp) · 320 unmodified lines
514	(log(chan->freq2) - log(chan->freq)) / p->samples_to_do : 1;	514	(log(chan->freq2) - log(chan->freq)) / p->samples_to_do : 1;
515	break;	515	break;
516	}	516	}
517	lsx_debug("type=%s, combine=%s, samples_to_do=%lu, f1=%g, f2=%g, "	517	lsx_debug("type=%s, combine=%s, samples_to_do=%" PRIu64 ", f1=%g, f2=%g, "
518	"offset=%g, phase=%g, p1=%g, p2=%g, p3=%g mult=%g",	518	"offset=%g, phase=%g, p1=%g, p2=%g, p3=%g mult=%g",
519	lsx_find_enum_value(chan->type, synth_type)->text,	519	lsx_find_enum_value(chan->type, synth_type)->text,
520	lsx_find_enum_value(chan->combine, combine_type)->text,	520	lsx_find_enum_value(chan->combine, combine_type)->text,
521	(unsigned long)p->samples_to_do, chan->freq, chan->freq2,	521	p->samples_to_do, chan->freq, chan->freq2,
522	chan->offset, chan->phase, chan->p1, chan->p2, chan->p3, chan->mult);	522	chan->offset, chan->phase, chan->p1, chan->p2, chan->p3, chan->mult);
523	}	523	}
524	p->gain = 1;	524	p->gain = 1;

src/trim.c+3−3

@@ -31,7 +31,7 @@ static int sox_trim_getopts(sox_effect_t * effp, int argc, char **argv) · 30 unmodified lines
31	{	31	{
32	char *end;	32	char *end;
33	priv_t * trim = (priv_t *) effp->priv;	33	priv_t * trim = (priv_t *) effp->priv;
34	size_t samples;	34	uint64_t samples;
35	const char *n;	35	const char *n;
36	--argc, ++argv;	36	--argc, ++argv;
37		37
@@ -72,7 +72,7 @@ static int sox_trim_getopts(sox_effect_t * effp, int argc, char **argv) · 34 unmodified lines
72	static int sox_trim_start(sox_effect_t * effp)	72	static int sox_trim_start(sox_effect_t * effp)
73	{	73	{
74	priv_t * trim = (priv_t *) effp->priv;	74	priv_t * trim = (priv_t *) effp->priv;
75	size_t samples;	75	uint64_t samples;
76		76
77	if (lsx_parsesamples(effp->in_signal.rate, trim->start_str,	77	if (lsx_parsesamples(effp->in_signal.rate, trim->start_str,
78	&samples, 't') == NULL)	78	&samples, 't') == NULL)
@@ -98,7 +98,7 @@ static int sox_trim_start(sox_effect_t * effp) · 19 unmodified lines
98	trim->length = 0;	98	trim->length = 0;
99	/* with trim->end_str == NULL, this means indefinite length */	99	/* with trim->end_str == NULL, this means indefinite length */
100		100
101	lsx_debug("start at %lus, length %lu", (unsigned long)trim->start, (unsigned long)trim->length);	101	lsx_debug("start at %" PRIu64 ", length %" PRIu64, trim->start, trim->length);
102		102
103	/* Account for # of channels */	103	/* Account for # of channels */
104	trim->start *= effp->in_signal.channels;	104	trim->start *= effp->in_signal.channels;

Count samples with 64 bits in more places

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -1515,7 +1515,7 @@ Data passed to/from the format handler · 1514 unmodified lines
1515	*/	1515	*/
1516	struct sox_format_t {	1516	struct sox_format_t {
1517	char * filename; /*< File name /	1517	char * filename; /*< File name /
1518		1518
1519	/**	1519	/**
1520	Signal specifications for reader (decoder) or writer (encoder):	1520	Signal specifications for reader (decoder) or writer (encoder):
1521	sample rate, number of channels, precision, length, headroom multiplier.	1521	sample rate, number of channels, precision, length, headroom multiplier.
@@ -1543,7 +1543,7 @@ struct sox_format_t { · 21 unmodified lines
1543	sox_bool seekable; /*< Can seek on this file /	1543	sox_bool seekable; /*< Can seek on this file /
1544	char mode; /*< Read or write mode ('r' or 'w') /	1544	char mode; /*< Read or write mode ('r' or 'w') /
1545	sox_uint64_t olength; /*< Samples chans written to file */	1545	sox_uint64_t olength; /*< Samples chans written to file */
1546	size_t clips; /*< Incremented if clipping occurs /	1546	sox_uint64_t clips; /*< Incremented if clipping occurs /
1547	int sox_errno; /*< Failure error code /	1547	int sox_errno; /*< Failure error code /
1548	char sox_errstr[256]; /*< Failure error text /	1548	char sox_errstr[256]; /*< Failure error text /
1549	void * fp; /*< File stream pointer /	1549	void * fp; /*< File stream pointer /
@@ -1606,7 +1606,7 @@ struct sox_effect_t { · 56 unmodified lines
1606	size_t obeg; /*< output buffer consumed /	1606	size_t obeg; /*< output buffer consumed /
1607	size_t oend; /*< output buffer total length /	1607	size_t oend; /*< output buffer total length /
1608	size_t imin; /*< minimum input buffer size /	1608	size_t imin; /*< minimum input buffer size /
1609	size_t clips; /*< increment if clipping occurs /	1609	sox_uint64_t clips; /*< increment if clipping occurs /
1610	size_t flows; /*< 1 if MCHAN, number of chans otherwise /	1610	size_t flows; /*< 1 if MCHAN, number of chans otherwise /
1611	size_t flow; /*< flow number /	1611	size_t flow; /*< flow number /
1612	void * priv; /*< Effect's private data area /	1612	void * priv; /*< Effect's private data area /
@@ -2129,7 +2129,7 @@ Client API: · 516 unmodified lines
2129	Gets the number of clips that occurred while running an effects chain.	2129	Gets the number of clips that occurred while running an effects chain.
2130	@returns the number of clips that occurred while running an effects chain.	2130	@returns the number of clips that occurred while running an effects chain.
2131	*/	2131	*/
2132	size_t	2132	sox_uint64_t
2133	LSX_API	2133	LSX_API
2134	sox_effects_clips(	2134	sox_effects_clips(
2135	LSX_PARAM_IN sox_effects_chain_t * chain /*< Effects chain from which to read clip information. /	2135	LSX_PARAM_IN sox_effects_chain_t * chain /*< Effects chain from which to read clip information. /
@@ -2140,7 +2140,7 @@ Client API: · 4 unmodified lines
2140	Shuts down an effect (calls stop on each of its flows).	2140	Shuts down an effect (calls stop on each of its flows).
2141	@returns the number of clips from all flows.	2141	@returns the number of clips from all flows.
2142	*/	2142	*/
2143	size_t	2143	sox_uint64_t
2144	LSX_API	2144	LSX_API
2145	sox_stop_effect(	2145	sox_stop_effect(
2146	LSX_PARAM_INOUT_COUNT(effp->flows) sox_effect_t * effp /*< Effect to stop. /	2146	LSX_PARAM_INOUT_COUNT(effp->flows) sox_effect_t * effp /*< Effect to stop. /

@@ -50,12 +50,12 @@ typedef struct { · 49 unmodified lines
50	unsigned nsplices; /* Number of splices requested */	50	unsigned nsplices; /* Number of splices requested */
51	struct {	51	struct {
52	char * str; /* Command-line argument to parse for this splice */	52	char * str; /* Command-line argument to parse for this splice */
53	size_t overlap; /* Number of samples to overlap */	53	uint64_t overlap; /* Number of samples to overlap */
54	size_t search; /* Number of samples to search */	54	uint64_t search; /* Number of samples to search */
55	size_t start; /* Start splicing when in_pos equals this */	55	uint64_t start; /* Start splicing when in_pos equals this */
56	} * splices;	56	} * splices;
57		57
58	size_t in_pos; /* Number of samples read from the input stream */	58	uint64_t in_pos; /* Number of samples read from the input stream */
59	unsigned splices_pos; /* Number of splices completed so far */	59	unsigned splices_pos; /* Number of splices completed so far */
60	size_t buffer_pos; /* Number of samples through the current splice */	60	size_t buffer_pos; /* Number of samples through the current splice */
61	size_t max_buffer_size;	61	size_t max_buffer_size;
@@ -64,7 +64,7 @@ typedef struct { · 2 unmodified lines
64	} priv_t;	64	} priv_t;
65		65
66	static void splice(sox_effect_t * effp, const sox_sample_t * in1, const	66	static void splice(sox_effect_t * effp, const sox_sample_t * in1, const
67	sox_sample_t * in2, sox_sample_t * output, size_t overlap, size_t channels)	67	sox_sample_t * in2, sox_sample_t * output, uint64_t overlap, size_t channels)
68	{	68	{
69	priv_t * p = (priv_t *)effp->priv;	69	priv_t * p = (priv_t *)effp->priv;
70	size_t i, j, k = 0;	70	size_t i, j, k = 0;
@@ -104,10 +104,10 @@ static void splice(sox_effect_t * effp, const sox_sample_t * in1, const · 33 unmodified lines
104	}	104	}
105	}	105	}
106		106
107	static size_t do_splice(sox_effect_t * effp,	107	static uint64_t do_splice(sox_effect_t * effp,
108	sox_sample_t * f, size_t overlap, size_t search, size_t channels)	108	sox_sample_t * f, uint64_t overlap, uint64_t search, size_t channels)
109	{	109	{
110	size_t offset = search? best_overlap_position(	110	uint64_t offset = search? best_overlap_position(
111	f, f + overlap * channels, overlap, search, channels) : 0;	111	f, f + overlap * channels, overlap, search, channels) : 0;
112	splice(effp, f, f + (overlap + offset) * channels,	112	splice(effp, f, f + (overlap + offset) * channels,
113	f + (overlap + offset) * channels, overlap, channels);	113	f + (overlap + offset) * channels, overlap, channels);