X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=cd3af8b168f9b306059ae15108752cf8430fc95c;hb=71b03eab3391a83ab2edd5ca0e96c83b8e2fcd4f;hp=392a108d71835413badb9c84afa4f56a66cd6133;hpb=8dc8c510c13b8ff5692f497004c818f2b6dfeb41;p=wdq2wav.git diff --git a/wdq2wav.cpp b/wdq2wav.cpp index 392a108..cd3af8b 100644 --- a/wdq2wav.cpp +++ b/wdq2wav.cpp @@ -8,7 +8,7 @@ ** ** Copyright (c) 2003 Kevin Rosenberg ** -** $Id: wdq2wav.cpp,v 1.15 2003/02/12 06:10:19 kevin Exp $ +** $Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 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,17 +26,36 @@ #include -const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.15 2003/02/12 06:10:19 kevin Exp $"; +const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 kevin Exp $"; bool g_quiet = false; bool g_verbose = false; bool g_debug = false; +bool g_ignore_zero = 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) @@ -66,7 +85,7 @@ fileBasename (const char* filename) 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) @@ -89,12 +108,13 @@ usage (const char* progname) { std::cout << "usage: " << fileBasename (progname) << " [OPTIONS] \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 << " -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"; } @@ -106,7 +126,7 @@ main (int argc, char *argv[]) const char* progname = argv[0]; - while ((c = getopt (argc, argv, "rqvdph")) != -1) { + while ((c = getopt (argc, argv, "rqvzdph")) != -1) { switch (c) { case 'r': std::cout << "Version " << g_szIdStr << std::endl; @@ -123,6 +143,9 @@ main (int argc, char *argv[]) case 'p': play = true; break; + case 'z': + g_ignore_zero = true; + break; case 'h': usage (progname); return (0); @@ -236,6 +259,7 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p ", 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 << @@ -438,18 +462,19 @@ WindaqChannel::read_channel_data () m_units = units; unsigned int row_bytes = 2 * r_wdq.m_nChannels; - signed short int sample_row [row_bytes]; + 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; + unsigned long int i; signed short int data_max, data_min; 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; @@ -478,6 +503,7 @@ WindaqChannel::read_channel_data () m_max_scaled_data = (m_slope * data_max) + m_intercept; m_min_scaled_data = (m_slope * data_min) + m_intercept; + delete sample_row; return true; } @@ -491,12 +517,20 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) 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; @@ -519,12 +553,16 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) 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(value); #if WORDS_BIG_ENDIAN unsigned char* p = reinterpret_cast(&v); @@ -613,8 +651,7 @@ WavFile::WriteFile () return false; if (m_fd == 0) - if ((m_fd = open (m_strFile.c_str(), O_WRONLY | O_BINARY | 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());