ref: e0ea629b3b1736eea23456c9d753ad8e774d66f7
parent: 2c7f81258fca15c2d4ac1f6700ffff7f34427cc4
author: Erik de Castro Lopo <erikd@coltrane>
date: Wed Sep 15 07:19:54 EDT 2004
Fix bug, cleanup and constify src-evaluate.c.
--- a/tests/src-evaluate.c
+++ b/tests/src-evaluate.c
@@ -61,17 +61,17 @@
const char *version_cmd ;
const char *version_start ;
const char *convert_cmd ;
-
- char version [256] ;
int format ;
} RESAMPLE_PROG ;
static char *get_progname (char *) ;
-static void usage_exit (char *, RESAMPLE_PROG *prog, int count) ;
-static void measure_program (RESAMPLE_PROG *prog, int verbose) ;
-static void generate_source_wav (char *filename, double *freqs, int freq_count, int format) ;
+static void usage_exit (const char *, const RESAMPLE_PROG *prog, int count) ;
+static void measure_program (const RESAMPLE_PROG *prog, int verbose) ;
+static void generate_source_wav (const char *filename, const double *freqs, int freq_count, int format) ;
static const char* get_machine_details (void) ;
+static char version_string [512] ;
+
int
main (int argc, char *argv [])
{ static RESAMPLE_PROG resample_progs [] =@@ -79,14 +79,12 @@
"examples/sndfile-resample --version",
"libsamplerate",
"examples/sndfile-resample --max-speed -c 2 -to %d source.wav destination.wav",
- "", /* Version string retrived later. */
- SF_FORMAT_WAV | SF_FORMAT_FLOAT
+ SF_FORMAT_WAV | SF_FORMAT_PCM_32
},
{ "sox","sox -h 2>&1",
"sox",
"sox source.wav -r %d destination.wav resample 0.835",
- "", /* Version string retrived later. */
SF_FORMAT_WAV | SF_FORMAT_PCM_32
},
{ "ResampAudio",@@ -93,8 +91,7 @@
"ResampAudio --version",
"ResampAudio",
"ResampAudio -f cutoff=0.41,atten=100,ratio=128 -s %d source.wav destination.wav",
- "", /* Version string retrived later. */
- SF_FORMAT_WAV | SF_FORMAT_FLOAT
+ SF_FORMAT_WAV | SF_FORMAT_PCM_32
},
/*-
@@ -107,7 +104,6 @@
"ssrc",
"Shibatch",
"ssrc --rate %d source.wav destination.wav",
- "", /+* Version string retrived later. *+/
SF_FORMAT_WAV | SF_FORMAT_PCM_32
},-*/
@@ -120,7 +116,6 @@
"resample -version",
"resample",
"resample -to %d source.wav destination.wav",
- "", /+* Version string retrived later. *+/
SF_FORMAT_WAV | SF_FORMAT_FLOAT
},-*/
@@ -129,7 +124,6 @@
"mplayer -v 2>&1",
"MPlayer ",
"mplayer -ao pcm -srate %d source.wav >/dev/null 2>&1 && mv audiodump.wav destination.wav",
- "", /+* Version string retrived later. *+/
SF_FORMAT_WAV | SF_FORMAT_PCM_32
},-*/
@@ -180,7 +174,7 @@
} /* get_progname */
static void
-usage_exit (char *progname, RESAMPLE_PROG *prog, int count)
+usage_exit (const char *progname, const RESAMPLE_PROG *prog, int count)
{ int k ; printf ("\n Usage : %s <number>\n\n", progname) ;@@ -220,12 +214,12 @@
*/
static void
-get_version_string (RESAMPLE_PROG *prog)
+get_version_string (const RESAMPLE_PROG *prog)
{ FILE *file ;char *cptr ;
/* Default. */
- snprintf (prog->version, sizeof (prog->version), "no version") ;
+ snprintf (version_string, sizeof (version_string), "no version") ;
if (prog->version_cmd == NULL)
return ;
@@ -233,33 +227,33 @@
if ((file = popen (prog->version_cmd, "r")) == NULL)
return ;
- while ((cptr = fgets (prog->version, sizeof (prog->version), file)) != NULL)
+ while ((cptr = fgets (version_string, sizeof (version_string), file)) != NULL)
{if (strstr (cptr, prog->version_start) != NULL)
break ;
- prog->version [0] = 0 ;
+ version_string [0] = 0 ;
} ;
pclose (file) ;
/* Remove trailing newline. */
- if ((cptr = strchr (prog->version, '\n')) != NULL)
+ if ((cptr = strchr (version_string, '\n')) != NULL)
cptr [0] = 0 ;
/* Remove leading whitespace from version string. */
- cptr = prog->version ;
+ cptr = version_string ;
while (cptr [0] != 0 && isspace (cptr [0]))
cptr ++ ;
- if (cptr != prog->version)
- strncpy (prog->version, cptr, sizeof (prog->version)) ;
+ if (cptr != version_string)
+ strncpy (version_string, cptr, sizeof (version_string)) ;
return ;
} /* get_version_string */
static void
-generate_source_wav (char *filename, double *freqs, int freq_count, int format)
+generate_source_wav (const char *filename, const double *freqs, int freq_count, int format)
{ static float buffer [BUFFER_LEN] ;SNDFILE *sndfile ;
@@ -276,7 +270,7 @@
sf_command (sndfile, SFC_SET_ADD_PEAK_CHUNK, NULL, SF_FALSE) ;
- gen_windowed_sines (freq_count, freqs, 1.0, buffer, ARRAY_LEN (buffer)) ;
+ gen_windowed_sines (freq_count, freqs, 0.9, buffer, ARRAY_LEN (buffer)) ;
if (sf_write_float (sndfile, buffer, ARRAY_LEN (buffer)) != ARRAY_LEN (buffer))
{ printf ("Line %d : sf_write_float short write.\n", __LINE__) ;@@ -324,7 +318,7 @@
} /* measure_desination_wav */
static double
-measure_snr (RESAMPLE_PROG *prog, int *output_samples, int verbose)
+measure_snr (const RESAMPLE_PROG *prog, int *output_samples, int verbose)
{ static SNR_TEST snr_test [] = { { 1, { 0.211111111111 }, 48000, 1, 1.0 },@@ -414,7 +408,7 @@
} /* measure_destination_peak */
static double
-find_attenuation (double freq, RESAMPLE_PROG *prog, int verbose)
+find_attenuation (double freq, const RESAMPLE_PROG *prog, int verbose)
{ static char command [256] ;double output_peak ;
int retval ;
@@ -440,7 +434,7 @@
} /* find_attenuation */
static double
-bandwidth_test (RESAMPLE_PROG *prog, int verbose)
+bandwidth_test (const RESAMPLE_PROG *prog, int verbose)
{ double f1, f2, a1, a2 ;double freq, atten ;
@@ -479,7 +473,7 @@
} /* bandwidth_test */
static void
-measure_program (RESAMPLE_PROG *prog, int verbose)
+measure_program (const RESAMPLE_PROG *prog, int verbose)
{ double snr, bandwidth, conversion_rate ;int output_samples ;
struct tms time_data ;
@@ -490,7 +484,7 @@
printf (" Date : %s", ctime (&time_now)) ;get_version_string (prog) ;
- printf (" Program : %s\n", prog->version) ;+ printf (" Program : %s\n", version_string) ; printf (" Command : %s\n\n", prog->convert_cmd) ;snr = measure_snr (prog, &output_samples, verbose) ;