ref: c8a94e015b67f6f894acd311f4a4d4cd064366f0
parent: 5caea02c2c1154bd2455ae2762ff8b840003896b
author: Erik de Castro Lopo <erikd@mingus>
date: Fri Mar 31 04:13:47 EST 2006
Merge tests/calc_snr.h into tests/util.h and remove old file.
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@
SAMPLRATEDIR =../src
INCLUDES = -I$(srcdir)/$(SAMPLRATEDIR)
-noinst_HEADERS = calc_snr.h util.h
+noinst_HEADERS = util.h
#===============================================================================
@@ -35,7 +35,7 @@
float_short_test_SOURCES = float_short_test.c util.c util.h
float_short_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la
-varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c calc_snr.h
+varispeed_test_SOURCES = varispeed_test.c util.c util.h calc_snr.c
varispeed_test_LDADD = $(SAMPLRATEDIR)/libsamplerate.la $(FFTW3_LIBS)
# This program is for evaluating other sample rate converters.
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -7,7 +7,6 @@
#include <samplerate.h>
#include "util.h"
-#include "calc_snr.h"
#define BUFFER_LEN (1<<23)
#define SNR_LEN (1<<16)
--- a/tests/calc_snr.c
+++ b/tests/calc_snr.c
@@ -18,7 +18,6 @@
#include "config.h"
-#include "calc_snr.h"
#include "util.h"
#if (HAVE_FFTW3 == 1)
--- a/tests/calc_snr.h
+++ /dev/null
@@ -1,27 +1,0 @@
-/*
-** Copyright (C) 2002-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-double calculate_snr (float *data, int len, int expected_peaks) ;
-/*
-** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
-** revision control system.
-**
-** arch-tag: b35c91c0-a2a7-4628-8c4e-59b582da2f42
-*/
-
--- a/tests/multi_channel_test.c
+++ b/tests/multi_channel_test.c
@@ -16,6 +16,8 @@
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -24,9 +26,6 @@
#include <samplerate.h>
#include "util.h"
-#include "calc_snr.h"
-#include "config.h"
-
#define BUFFER_LEN (1<<15)
#define BLOCK_LEN (12)
--- a/tests/snr_bw_test.c
+++ b/tests/snr_bw_test.c
@@ -16,6 +16,8 @@
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -22,14 +24,11 @@
#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
--- a/tests/src-evaluate.c
+++ b/tests/src-evaluate.c
@@ -33,7 +33,6 @@
#include <math.h>
#include <sys/utsname.h>
-#include "calc_snr.h"
#include "util.h"
#define MAX_FREQS 4
--- a/tests/util.h
+++ b/tests/util.h
@@ -33,6 +33,8 @@
void reverse_data (float *data, int datalen) ;
+double calculate_snr (float *data, int len, int expected_peaks) ;
+
/*
** Do not edit or modify anything in this comment block.
** The arch-tag line is a file identity tag for the GNU Arch
--- a/tests/varispeed_test.c
+++ b/tests/varispeed_test.c
@@ -24,7 +24,6 @@
#include <samplerate.h>
#include "util.h"
-#include "calc_snr.h"
#define BUFFER_LEN (1 << 16)