**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 kevin Exp $
+** $Id: wdq2wav.cpp,v 1.21 2003/02/25 18:14:10 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
#include <wdq2wav.h>
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.21 2003/02/25 18:14:10 kevin Exp $";
bool g_quiet = false;
bool g_verbose = false;
bool g_debug = false;
bool g_ignore_zero = false;
+bool g_demean = false;
#ifdef WIN32
std::cout << " -p Play channel through audio system\n";
std::cout << " -q Supress all messages\n";
std::cout << " -z Scale output without regard for windaq zero point\n";
+ std::cout << " -m Demean the data (subtract the mean value from each sample)\n";
std::cout << " -v Verbose mode\n";
std::cout << " -d Debug mode\n";
std::cout << " -r Print program version\n";
const char* progname = argv[0];
- while ((c = getopt (argc, argv, "rqvzdph")) != -1) {
+ while ((c = getopt (argc, argv, "rqvzmdph")) != -1) {
switch (c) {
case 'r':
std::cout << "Version " << g_szIdStr << std::endl;
case 'q':
g_quiet = true;
break;
+ case 'm':
+ g_demean = true;
+ break;
case 'v':
g_verbose = true;
break;
WindaqFile::WindaqFile (const char* fname)
- : m_fd(0), m_nChannels(0), m_nSamples(0), m_sample_rate(0), m_valid(false),
+ : m_valid(false), m_fd(0), m_nChannels(0), m_nSamples(0), m_sample_rate(0),
m_strFile (fname)
{
}
return true;
}
+inline T nearest (double x)
+{ return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
+
bool
WindaqChannel::read_channel_data ()
{
- unsigned short int tmp2;
- unsigned int tmp4;
-
int fd = r_wdq.m_fd;
m_data = new signed short int [r_wdq.m_nSamples * 2];
}
m_units = units;
- unsigned int row_bytes = 2 * r_wdq.m_nChannels;
+ long int row_bytes = 2 * r_wdq.m_nChannels;
signed short int *sample_row = new signed short int [row_bytes];
signed short int* psample = &sample_row[m_channel - 1];
lseek (fd, r_wdq.m_nHeader_bytes, SEEK_SET);
unsigned long int i;
- signed short int data_max, data_min;
+ signed short int data_max = 0, data_min = 0;
+ double total_data = 0;
for (i = 0; i < r_wdq.m_nSamples; i++) {
if (read (fd, sample_row, row_bytes) != row_bytes) {
std::ostringstream os;
signed short int value = v >> 2;
m_data[i] = value;
+ total_data += value;
if (i == 0) {
data_max = value;
m_max_scaled_data = (m_slope * data_max) + m_intercept;
m_min_scaled_data = (m_slope * data_min) + m_intercept;
+ if (g_demean) {
+ double dmean = total_data / static_cast<double> wdq.m_nSamples;
+ int mean = nearest<int>(dmean);
+ for (i = 0; i < r_wdq.m_nSamples; i++)
+ m_data[i] -= mean;
+ }
+
delete sample_row;
return true;
}
bool
WavFile::WriteFile ()
{
- unsigned short int tmp2;
- unsigned int tmp4;
-
if (! m_valid)
return false;
close(fd); return false;
}
- int channels = m_nChannels;
+ unsigned int channels = m_nChannels;
if (ioctl (fd, SNDCTL_DSP_CHANNELS, &format) == -1) {
error_msg ("Error setting number of channels");
close(fd); return false;
close(fd); return false;
}
- int speed = static_cast<int>(m_rate + 0.5);
+ unsigned int speed = static_cast<int>(m_rate + 0.5);
if (ioctl (fd, SNDCTL_DSP_SPEED, &speed) == -1) {
error_msg ("Error setting sample rate");
close(fd); return false;