Fix knock on effects of calc_snr.c fixes.

Erik de Castro Lopo committed 20 years ago

Commit 52554fc1 parent ad15d5d3 files · +21 −13Browse files

Unified · Split

3 files

ChangeLog +8 −0
tests/snr_bw_test.c +9 −9
tests/varispeed_test.c +4 −4

@@ -1,3 +1,11 @@
	1	+2006-05-26 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
	2	+
	3	+ * tests/calc_snr.c
	4	+ Fix minor bug in analysis routines.
	5	+
	6	+ * tests/varispeed_test.c tests/snr_bw_test.c
	7	+ Fix knock on effects of above change.
	8	+
1	9	2006-05-23 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
2	10
3	11	* src/Makefile.am

tests/snr_bw_test.c+9−9

@@ -74,12 +74,12 @@ main (int argc, char *argv []) · 73 unmodified lines
74	74	8,
75	75	BOOLEAN_FALSE,
76	76	{ { 1, { 0.01111111111 }, 3.0, 1, 28.0, 1.0 },
77		− { 1, { 0.01111111111 }, 0.6, 1, 37.0, 1.0 },
78		− { 1, { 0.01111111111 }, 0.3, 1, 37.0, 1.0 },
	77	+ { 1, { 0.01111111111 }, 0.6, 1, 36.0, 1.0 },
	78	+ { 1, { 0.01111111111 }, 0.3, 1, 36.0, 1.0 },
79	79	{ 1, { 0.01111111111 }, 1.0, 1, 150.0, 1.0 },
80	80	{ 1, { 0.01111111111 }, 1.001, 1, 38.0, 1.0 },
81	81	{ 2, { 0.011111, 0.324 }, 1.9999, 2, 14.0, 1.0 },
82		− { 2, { 0.012345, 0.457 }, 0.456789, 1, 32.0, 1.0 },
	82	+ { 2, { 0.012345, 0.457 }, 0.456789, 1, 12.0, 1.0 },
83	83	{ 1, { 0.3511111111 }, 1.33, 1, 10.0, 1.0 }
84	84	}
85	85	},
@@ -88,12 +88,12 @@ main (int argc, char *argv []) · 2 unmodified lines
88	88	8,
89	89	BOOLEAN_FALSE,
90	90	{ { 1, { 0.01111111111 }, 3.0, 1, 73.0, 1.0 },
91		− { 1, { 0.01111111111 }, 0.6, 1, 74.0, 1.0 },
92		− { 1, { 0.01111111111 }, 0.3, 1, 74.0, 1.0 },
	91	+ { 1, { 0.01111111111 }, 0.6, 1, 73.0, 1.0 },
	92	+ { 1, { 0.01111111111 }, 0.3, 1, 73.0, 1.0 },
93	93	{ 1, { 0.01111111111 }, 1.0, 1, 150.0, 1.0 },
94	94	{ 1, { 0.01111111111 }, 1.001, 1, 77.0, 1.0 },
95		− { 2, { 0.011111, 0.324 }, 1.9999, 2, 97.0, 0.94 },
96		− { 2, { 0.012345, 0.457 }, 0.456789, 1, 60.0, 0.96 },
	95	+ { 2, { 0.011111, 0.324 }, 1.9999, 2, 16.0, 0.94 },
	96	+ { 2, { 0.012345, 0.457 }, 0.456789, 1, 26.0, 0.96 },
97	97	{ 1, { 0.3511111111 }, 1.33, 1, 22.0, 0.99 }
98	98	}
99	99	},
@@ -102,7 +102,7 @@ main (int argc, char *argv []) · 2 unmodified lines
102	102	9,
103	103	BOOLEAN_TRUE,
104	104	{ { 1, { 0.01111111111 }, 3.0, 1, 100.0, 1.0 },
105		− { 1, { 0.01111111111 }, 0.6, 1, 100.0, 1.0 },
	105	+ { 1, { 0.01111111111 }, 0.6, 1, 99.0, 1.0 },
106	106	{ 1, { 0.01111111111 }, 0.3, 1, 100.0, 1.0 },
107	107	{ 1, { 0.01111111111 }, 1.0, 1, 150.0, 1.0 },
108	108	{ 1, { 0.01111111111 }, 1.001, 1, 100.0, 1.0 },
@@ -117,7 +117,7 @@ main (int argc, char *argv []) · 8 unmodified lines
117	117	9,
118	118	BOOLEAN_TRUE,
119	119	{ { 1, { 0.01111111111 }, 3.0, 1, 100.0, 1.0 },
120		− { 1, { 0.01111111111 }, 0.6, 1, 100.0, 1.0 },
	120	+ { 1, { 0.01111111111 }, 0.6, 1, 99.0, 1.0 },
121	121	{ 1, { 0.01111111111 }, 0.3, 1, 100.0, 1.0 },
122	122	{ 1, { 0.01111111111 }, 1.0, 1, 149.0, 1.0 },
123	123	{ 1, { 0.01111111111 }, 1.001, 1, 100.0, 1.0 },

tests/varispeed_test.c+4−4

@@ -34,13 +34,13 @@ main (void) · 33 unmodified lines
34	34	{
35	35	puts ("") ;
36	36	printf (" Zero Order Hold interpolator : ") ;
37		− varispeed_test (SRC_ZERO_ORDER_HOLD, 45.0) ;
	37	+ varispeed_test (SRC_ZERO_ORDER_HOLD, 10.0) ;
38	38
39	39	printf (" Linear interpolator : ") ;
40		− varispeed_test (SRC_LINEAR, 85.0) ;
	40	+ varispeed_test (SRC_LINEAR, 10.0) ;
41	41
42	42	printf (" Sinc interpolator : ") ;
43		− varispeed_test (SRC_SINC_FASTEST, 125.0) ;
	43	+ varispeed_test (SRC_SINC_FASTEST, 115.0) ;
44	44
45	45	puts ("") ;
46	46
@@ -140,7 +140,7 @@ varispeed_test (int converter, double target_snr) · 93 unmodified lines
140	140	snr = calculate_snr (output, src_data.output_frames_gen, 1) ;
141	141
142	142	if (target_snr > snr)
143		− { printf ("\n\nLine %d : snr (%3.1f) does not meet target (%3.1f)\n\n", __LINE__, target_snr, snr) ;
	143	+ { printf ("\n\nLine %d : snr (%3.1f) does not meet target (%3.1f)\n\n", __LINE__, snr, target_snr) ;
144	144	save_oct_float ("varispeed.mat", input, src_data.input_frames, output, src_data.output_frames_gen) ;
145	145	exit (1) ;
146	146	} ;

Fix knock on effects of calc_snr.c fixes.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code