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	5	SAMPLRATEDIR =../src
6	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	35	float_short_test_SOURCES = float_short_test.c util.c util.h
36	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	39	varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
40	40
41	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		−

@@ -16,6 +16,8 @@ · 15 unmodified lines
16	16	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
17	17	*/
18	18
	19	+#include "config.h"
	20	+
19	21	#include <stdio.h>
20	22	#include <stdlib.h>
21	23	#include <string.h>
@@ -24,9 +26,6 @@ · 2 unmodified lines
24	26	#include <samplerate.h>
25	27
26	28	#include "util.h"
27		−#include "calc_snr.h"
28		−#include "config.h"
29		−
30	29	#define BUFFER_LEN (1<<15)
31	30	#define BLOCK_LEN (12)
32	31

@@ -16,20 +16,19 @@ · 15 unmodified lines
16	16	** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
17	17	*/
18	18
	19	+#include "config.h"
	20	+
19	21	#include <stdio.h>
20	22	#include <stdlib.h>
21	23	#include <string.h>
22	24	#include <math.h>
23	25	#include <time.h>
24	26
25		−#include "config.h"
26		−
27	27	#if (HAVE_FFTW3)
28	28
29	29	#include <samplerate.h>
30	30
31	31	#include "util.h"
32		−#include "calc_snr.h"
33	32
34	33	#define BUFFER_LEN 50000
35	34	#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	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	39	** Do not edit or modify anything in this comment block.
38	40	** The arch-tag line is a file identity tag for the GNU Arch

Keyboard shortcuts