Merge tests/calc_snr.h into tests/util.h and remove old file.

Erik de Castro Lopo committed 20 years ago

Commit c8a94e01 parent 5caea029 files · +8 −39Browse files

Unified · Split

9 files

@@ -4,7 +4,7 @@ noinst_PROGRAMS = misc_test termination_test simple_test callback_test \ · 3 unmodified lines
4		4
5	SAMPLRATEDIR =../src	5	SAMPLRATEDIR =../src
6	INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)	6	INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
7	noinst_HEADERS = calc_snr.h util.h	7	noinst_HEADERS = util.h
8		8
9	#===============================================================================	9	#===============================================================================
10		10
@@ -35,7 +35,7 @@ callback_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la · 24 unmodified lines
35	float_short_test_SOURCES = float_short_test.c util.c util.h	35	float_short_test_SOURCES = float_short_test.c util.c util.h
36	float_short_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la	36	float_short_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
37		37
38	varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c calc_snr.h	38	varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c
39	varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)	39	varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
40		40
41	# This program is for evaluating other sample rate converters.	41	# This program is for evaluating other sample rate converters.

@@ -1,27 +0,0 @@
1	/*
2	** Copyright (C) 2002-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
3	**
4	** This program is free software; you can redistribute it and/or modify
5	** it under the terms of the GNU General Public License as published by
6	** the Free Software Foundation; either version 2 of the License, or
7	** (at your option) any later version.
8	**
9	** This program is distributed in the hope that it will be useful,
10	** but WITHOUT ANY WARRANTY; without even the implied warranty of
11	** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	** GNU General Public License for more details.
13	**
14	** You should have received a copy of the GNU General Public License
15	** along with this program; if not, write to the Free Software
16	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
17	*/
18
19	double calculate_snr (float *data, int len, int expected_peaks) ;
20	/*
21	** Do not edit or modify anything in this comment block.
22	** The arch-tag line is a file identity tag for the GNU Arch
23	** revision control system.
24	**
25	** arch-tag: b35c91c0-a2a7-4628-8c4e-59b582da2f42
26	*/
27

 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 */
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <samplerate.h>
 #include "util.h"
-#include "calc_snr.h"
-#include "config.h"
 #define	BUFFER_LEN		(1<<15)
 #define	BLOCK_LEN		(12)

 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 */
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
-#include "config.h"
 #if (HAVE_FFTW3)
 #include <samplerate.h>
 #include "util.h"
-#include "calc_snr.h"
 #define	BUFFER_LEN		50000
 #define	MAX_FREQS		4

@@ -33,6 +33,8 @@ void deinterleave_data (const float in, float out, int frames, int channels) ; · 32 unmodified lines
33		33
34	void reverse_data (float *data, int datalen) ;	34	void reverse_data (float *data, int datalen) ;
35		35
		36	double calculate_snr (float *data, int len, int expected_peaks) ;
		37
36	/*	38	/*
37	** Do not edit or modify anything in this comment block.	39	** Do not edit or modify anything in this comment block.
38	** The arch-tag line is a file identity tag for the GNU Arch	40	** The arch-tag line is a file identity tag for the GNU Arch

Keyboard shortcuts