**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.cpp,v 1.14 2003/01/21 19:52:20 kevin Exp $
+** $Id: wdq2wav.cpp,v 1.23 2003/02/25 18:18:45 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.14 2003/01/21 19:52:20 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.23 2003/02/25 18:18:45 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
+#define lseek _lseek
+#define close _close
+#define open _open
+#define read _read
+#define write _write
+#define O_BINARY _O_BINARY
+#define O_RDONLY _O_RDONLY
+#define O_WRONLY _O_WRONLY
+#define O_RDWR _O_RDRW
+#define O_TRUNC _O_TRUNC
+#define O_CREAT _O_CREAT
+const int g_fileMode = _S_IWRITE | _S_IREAD;
+struct fpos_t std::_Fpz = {0,0};
+#else
+const int g_fileMode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+// Define as NULL for non-Windows platforms
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#endif
+
void
error_msg (const char *msg)
char *
str_rm_tail (char *str, const char* const charlist)
{
- int i;
+ size_t i;
for (i = strlen(str) - 1; i >= 0; i--)
if (strchr (charlist, str[i]) != NULL)
{
std::cout << "usage: " << fileBasename (progname) << " [OPTIONS] <wdq-file> <channel-number> <wav-file>\n";
std::cout << "OPTIONS\n";
- std::cout << " -p Play channel through audio system\n";
- std::cout << " -q Supress all messages\n";
- std::cout << " -v Verbose mode\n";
- std::cout << " -d Debug mode\n";
- std::cout << " -r Print program version\n";
- std::cout << " -h Print this help message\n";
+ 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";
+ std::cout << " -h Print this help message\n";
}
const char* progname = argv[0];
- while ((c = getopt (argc, argv, "rqvdph")) != -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;
case 'p':
play = true;
break;
+ case 'z':
+ g_ignore_zero = true;
+ break;
case 'h':
usage (progname);
return (0);
", maximum: " << wdq_channel.m_max_raw_data;
info_msg (os3.str().c_str());
}
+
if (g_debug) {
std::ostringstream os4;
os4 << " Scaled minimum: " << wdq_channel.m_min_scaled_data <<
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)
{
}
unsigned short int tmp2;
m_valid = false;
- if ((m_fd = open (m_strFile.c_str(), O_RDONLY)) < 0) {
+ if ((m_fd = open (m_strFile.c_str(), O_RDONLY | O_BINARY)) < 0) {
m_error = "Unable to open file";
return false;
}
return true;
}
+
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;
- signed short int sample_row [row_bytes];
+ 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);
- long int i;
- signed short int data_max, data_min;
+ unsigned long int i;
+ 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;
os << "Error reading file at " << i;
error_msg (os.str().c_str());
+ delete sample_row;
return false;
}
signed short int v = *psample;
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;
}
m_nBitsPerSample = 16;
m_nBytesPerSample = 2;
m_rate = wdq_channel.r_wdq.m_sample_rate;
-
- double data_offset = -wdq_channel.m_min_scaled_data;
- double data_scale = 0.;
- if (wdq_channel.m_max_scaled_data != wdq_channel.m_min_scaled_data)
- data_scale = 65535. / (wdq_channel.m_max_scaled_data -
- wdq_channel.m_min_scaled_data);
+
+ double data_offset = 0, data_scale = 0;
+ if (g_ignore_zero) {
+ data_offset = -wdq_channel.m_min_scaled_data;
+ if (wdq_channel.m_max_scaled_data != wdq_channel.m_min_scaled_data)
+ data_scale = 65535. / (wdq_channel.m_max_scaled_data -
+ wdq_channel.m_min_scaled_data);
+ } else {
+ double max_value = fabs(wdq_channel.m_max_scaled_data);
+ if (fabs (wdq_channel.m_min_scaled_data) > max_value)
+ max_value = fabs (wdq_channel.m_min_scaled_data);
+ if (max_value != 0.)
+ data_scale = 32767. / max_value;
+ }
if (g_debug) {
std::ostringstream os;
if (! fill_header ())
return;
- long int i;
+ unsigned long int i;
for (i = 0; i < m_nSamples; i++) {
double value = input[i];
value = (slope * value) + intercept;
- value = (value + data_offset) * data_scale;
- value += 0.5 - 32768;
+ if (g_ignore_zero) {
+ value = (value + data_offset) * data_scale;
+ value += 0.5 - 32768;
+ } else
+ value = value * data_scale;
+
signed short int v = static_cast<signed short int>(value);
#if WORDS_BIG_ENDIAN
unsigned char* p = reinterpret_cast<unsigned char*>(&v);
bool
WavFile::WriteFile ()
{
- unsigned short int tmp2;
- unsigned int tmp4;
-
if (! m_valid)
return false;
if (m_fd == 0)
- if ((m_fd = open (m_strFile.c_str(), O_WRONLY | O_TRUNC | O_CREAT,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) == 0) {
+ if ((m_fd = open (m_strFile.c_str(), O_WRONLY | O_BINARY | O_TRUNC | O_CREAT, g_fileMode)) == 0) {
std::ostringstream os;
os << "Error opening output file " << m_strFile.c_str();
error_msg (os.str().c_str());
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;
projects / wdq2wav.git / blobdiff