X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=fcc782cb8634d458696aa293e1f74e89efde723f;hb=9ccb27ac548ef8ff8f23cec5574d6d9fb8494779;hp=dd98f6b1ae70a604ebec63a823f6be10173b79e4;hpb=55fc5ba6b5c1a35195d12422f0bd956195e00c4a;p=wdq2wav.git diff --git a/wdq2wav.cpp b/wdq2wav.cpp index dd98f6b..fcc782c 100644 --- a/wdq2wav.cpp +++ b/wdq2wav.cpp @@ -8,7 +8,7 @@ ** ** Copyright (c) 2003 Kevin Rosenberg ** -** $Id: wdq2wav.cpp,v 1.22 2003/02/25 18:15:06 kevin Exp $ +** $Id$ ** ** 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,13 +26,13 @@ #include -const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.22 2003/02/25 18:15:06 kevin Exp $"; +const char* g_szIdStr = "$Id$"; bool g_quiet = false; bool g_verbose = false; bool g_debug = false; bool g_ignore_zero = false; -bool g_demean = false; +bool g_dont_demean = false; #ifdef WIN32 @@ -79,8 +79,15 @@ info_msg_sans_newline (const char* msg) const char* fileBasename (const char* filename) { - const char* p = strrchr (filename, '/'); - return (p ? p + 1 : filename); + const char* pslash = strrchr (filename, '/'); + const char* pbackslash = strrchr (filename, '\\'); + const char* p = filename; + if (pbackslash && (! pslash || pbackslash >= pslash)) + p = pbackslash+1; + else if (pslash && (! pbackslash || pslash >= pbackslash)) + p = pslash+1; + + return p; } char * @@ -111,11 +118,11 @@ usage (const char* progname) std::cout << "OPTIONS\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 << " -z Scale output without preserving zero point\n"; + std::cout << " -m Do not demean the data (don't 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 << " -r Print program version and exit\n"; std::cout << " -h Print this help message\n"; } @@ -132,12 +139,16 @@ main (int argc, char *argv[]) switch (c) { case 'r': std::cout << "Version " << g_szIdStr << std::endl; + exit(0); break; case 'q': g_quiet = true; break; case 'm': - g_demean = true; + g_dont_demean = true; + break; + case 'z': + g_ignore_zero = true; break; case 'v': g_verbose = true; @@ -148,9 +159,6 @@ main (int argc, char *argv[]) case 'p': play = true; break; - case 'z': - g_ignore_zero = true; - break; case 'h': usage (progname); return (0); @@ -160,6 +168,10 @@ main (int argc, char *argv[]) return (1); } } + + if (g_verbose || g_debug) + std::cout << "Version " << g_szIdStr << std::endl; + argc -= optind; argv += optind; if (argc > 3) { @@ -227,8 +239,15 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p } if (! g_quiet || g_verbose || g_debug) { std::ostringstream os1; - os1 << "File " << wdq_fname; + os1 << "File: " << wdq_fname; info_msg (os1.str().c_str()); + std::ostringstream os; + os << "Legacy Format: "; + if (wdq.m_bLegacy_format) + os << "Yes"; + else + os << "No"; + info_msg(os.str().c_str()); std::ostringstream os2; time_t time = wdq.m_time_acq_start; struct tm* tm = gmtime (&time); @@ -335,6 +354,25 @@ bool read_int4 (int fd, unsigned int& n) return true; } +bool read_float8 (int fd, double& f) +{ + unsigned char buf[8]; + if (read (fd, &buf, 8) != 8) + return false; + +#if WORDS_BIG_ENDIAN + unsigned char c; + c = buf[0]; buf[0] = buf[7]; buf[7] = c; + c = buf[1]; buf[1] = buf[6]; buf[6] = c; + c = buf[2]; buf[2] = buf[5]; buf[5] = c; + c = buf[3]; buf[3] = buf[4]; buf[4] = c; +#endif + + f = *(reinterpret_cast(buf)); + + return true; +} + bool WindaqFile::ReadHeader () { @@ -350,16 +388,19 @@ WindaqFile::ReadHeader () if (! read_int2 (m_fd, tmp2)) return false; - m_nChannels = tmp2 & 0x1f; m_sr_denom = (tmp2 & 0x7fff) >> 5; m_sr_numer = (tmp2 & 0x8000) << 1; - + short unsigned int byte1 = (tmp2 & 0xFF00) >> 8; + short unsigned int byte2 = tmp2 & 0xFF; + if (byte1 == 0 || byte1 == 1) { + m_bLegacy_format = false; + } else { + m_bLegacy_format = true; + } if (! read_int2 (m_fd, tmp2)) return false; m_sr_numer |= tmp2; - m_sample_rate = (double) m_sr_numer / (double) (m_sr_denom * m_nChannels); - if (! read_int2 (m_fd, tmp2)) return false; @@ -368,12 +409,27 @@ WindaqFile::ReadHeader () if (! read_int2 (m_fd, m_nHeader_bytes)) return false; - + + m_nMaxChannels = (m_nHeader_bytes - 112) / 36; + if (m_nMaxChannels >= 144) + m_nChannels = byte2 & 0xFF; + else + m_nChannels = byte2 & 0x1F; + if (! read_int4 (m_fd, m_nData_bytes)) return false; m_nSamples = (m_nData_bytes / m_nChannels) / 2; + lseek (m_fd, 28, SEEK_SET); + if (! read_float8 (m_fd, m_time_between_channel_samples)) + return false; + + if (m_bLegacy_format) + m_sample_rate = (double) m_sr_numer / (double) (m_sr_denom * m_nChannels); + else + m_sample_rate = (double) m_nChannels / m_time_between_channel_samples; + lseek (m_fd, 36, SEEK_SET); if (! read_int4 (m_fd, m_time_acq_start)) return false; @@ -395,7 +451,6 @@ WindaqFile::ReadHeader () m_valid = true; return true; } - WindaqChannel::WindaqChannel (WindaqFile& wdq, const int channel) : r_wdq(wdq), m_data(0), m_slope(0), m_intercept (0), m_channel(channel), @@ -420,26 +475,6 @@ WindaqChannel::~WindaqChannel () delete m_data; } -bool get_float8 (int fd, double& f) -{ - unsigned char buf[8]; - if (read (fd, &buf, 8) != 8) - return false; - -#if WORDS_BIG_ENDIAN - unsigned char c; - c = buf[0]; buf[0] = buf[7]; buf[7] = c; - c = buf[1]; buf[1] = buf[6]; buf[6] = c; - c = buf[2]; buf[2] = buf[5]; buf[5] = c; - c = buf[3]; buf[3] = buf[4]; buf[4] = c; -#endif - - f = *(reinterpret_cast(buf)); - - return true; -} - - bool WindaqChannel::read_channel_data () { @@ -450,10 +485,10 @@ WindaqChannel::read_channel_data () lseek (fd, r_wdq.m_channel_offset + 8 + (m_channel - 1) * r_wdq.m_nBytes_channel_header, SEEK_SET); - if (! get_float8 (fd, m_slope)) + if (! read_float8 (fd, m_slope)) return false; - if (! get_float8 (fd, m_intercept)) + if (! read_float8 (fd, m_intercept)) return false; char units[7]; @@ -465,6 +500,7 @@ WindaqChannel::read_channel_data () m_units = units; 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]; @@ -508,9 +544,12 @@ 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 wdq.m_nSamples; + if (! g_dont_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; } @@ -572,8 +611,9 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) if (g_ignore_zero) { value = (value + data_offset) * data_scale; value += 0.5 - 32768; - } else + } else { value = value * data_scale; + } signed short int v = static_cast(value); #if WORDS_BIG_ENDIAN