shithub: libsamplerate

Info  •  Files  •  Log

Test and fix get_channels

Error codes returned are non-negative which confuses them with valid results.
Make sure the error code returned is inverted and hence negative.
Fixes #78

--- a/src/samplerate.c

+++ b/src/samplerate.c

@@ -309,9 +309,9 @@

 	psrc = (SRC_PRIVATE*) state ;

 	if (psrc == NULL)

-		return SRC_ERR_BAD_STATE ;

+		return -SRC_ERR_BAD_STATE ;

 	if (psrc->vari_process == NULL || psrc->const_process == NULL)

-		return SRC_ERR_BAD_PROC_PTR ;

+		return -SRC_ERR_BAD_PROC_PTR ;

 	return psrc->channels ;

 } /* src_get_channels */

--- a/tests/misc_test.c

+++ b/tests/misc_test.c

@@ -18,6 +18,7 @@

 static void error_test (void) ;

 static void src_ratio_test (void) ;

 static void zero_input_test (int converter) ;

+static void get_channels_test (int converter);

 int

 main (void)

@@ -37,6 +38,10 @@

 	zero_input_test (SRC_LINEAR) ;

 	zero_input_test (SRC_SINC_FASTEST) ;

+	get_channels_test (SRC_ZERO_ORDER_HOLD) ;

+	get_channels_test (SRC_LINEAR) ;

+	get_channels_test (SRC_SINC_FASTEST) ;

+

 	puts ("") ;

 	return 0 ;

 } /* main */

@@ -163,3 +168,35 @@

 	puts ("ok") ;

 } /* zero_input_test */

+

+static void get_channels_test(int converter)

+{

+	SRC_STATE *state;

+	int channels_in, channels_out;

+	const char *errorstr;

+

+	state = NULL;

+	if ((channels_out = src_get_channels(state)) >= 0)

+	{

+		printf ("\n\nLine %d : Return value should be negative, was : %d.\n\n", __LINE__, channels_out) ;

+		exit (1) ;

+	}

+	errorstr = src_strerror(-channels_out);

+	if (!strstr(errorstr, "NULL"))

+	{

+		printf ("\n\nLine %d : Inverted output should be valid error code mentioning a NULL pointer, was : %s.\n\n", __LINE__, errorstr) ;

+		exit (1) ;

+	}

+

+	for (channels_in = 1; channels_in <= 8; channels_in++)

+	{

+		int error;

+		state = src_new(converter, channels_in, &error);

+		if ((channels_out = src_get_channels(state)) != channels_in)

+		{

+			printf ("\n\nLine %d : Return value should be %d, was : %d.\n\n", __LINE__, channels_in, channels_out) ;

+			exit (1) ;

+		}

+		state = src_delete(state);

+	}

+}