X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=510294b9d48406d6ee0f14ba5e8e8c28ef72de9f;hb=1c71e531474edc2c706b71d615f7fc77b41eef55;hp=16eddba4560d82de001f304ad988e9db325e0e7a;hpb=c1c969d9db8d0a5fbe02563f7a8cc61d5638890d;p=wdq2wav.git diff --git a/wdq2wav.cpp b/wdq2wav.cpp index 16eddba..510294b 100644 --- a/wdq2wav.cpp +++ b/wdq2wav.cpp @@ -8,7 +8,7 @@ ** ** Copyright (c) 2003 Kevin Rosenberg ** -** $Id: wdq2wav.cpp,v 1.17 2003/02/24 08:40:25 kevin Exp $ +** $Id: wdq2wav.cpp,v 1.25 2003/02/25 18:24:48 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 @@ -26,12 +26,13 @@ #include -const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.17 2003/02/24 08:40:25 kevin Exp $"; +const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.25 2003/02/25 18:24:48 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 @@ -111,6 +112,7 @@ usage (const char* progname) 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"; @@ -126,7 +128,7 @@ main (int argc, char *argv[]) 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; @@ -134,6 +136,9 @@ main (int argc, char *argv[]) case 'q': g_quiet = true; break; + case 'm': + g_demean = true; + break; case 'v': g_verbose = true; break; @@ -143,6 +148,9 @@ main (int argc, char *argv[]) case 'p': play = true; break; + case 'z': + g_ignore_zero = true; + break; case 'h': usage (progname); return (0); @@ -288,7 +296,7 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p 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) { } @@ -431,12 +439,10 @@ bool get_float8 (int fd, double& f) 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]; @@ -458,14 +464,15 @@ WindaqChannel::read_channel_data () } 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; @@ -483,6 +490,7 @@ WindaqChannel::read_channel_data () signed short int value = v >> 2; m_data[i] = value; + total_data += value; if (i == 0) { data_max = value; @@ -500,6 +508,16 @@ WindaqChannel::read_channel_data () 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(r_wdq.m_nSamples); + int mean = nearest(dmean); + std::cout << "Removing mean: " << (dmean * m_slope) + m_intercept << + " " << m_units << std::endl; + + for (i = 0; i < r_wdq.m_nSamples; i++) + m_data[i] -= mean; + } + delete sample_row; return true; } @@ -523,9 +541,10 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) 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); - data_scale = 32767. / max_value; + 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) { @@ -553,9 +572,12 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) for (i = 0; i < m_nSamples; i++) { double value = input[i]; value = (slope * value) + intercept; - value = (value + data_offset) * data_scale; - if (g_ignore_zero) + 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(value); #if WORDS_BIG_ENDIAN unsigned char* p = reinterpret_cast(&v); @@ -637,9 +659,6 @@ WavFile::fill_header () bool WavFile::WriteFile () { - unsigned short int tmp2; - unsigned int tmp4; - if (! m_valid) return false; @@ -695,7 +714,7 @@ WavFile::Play () 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; @@ -705,7 +724,7 @@ WavFile::Play () close(fd); return false; } - int speed = static_cast(m_rate + 0.5); + unsigned int speed = static_cast(m_rate + 0.5); if (ioctl (fd, SNDCTL_DSP_SPEED, &speed) == -1) { error_msg ("Error setting sample rate"); close(fd); return false;