X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=60e58421c9a60554674abc11df48f2987b98d085;hb=746abe47c4eaefae0023dde9a8938b80bfcb8247;hp=288a9c6c0e14e67b8357e567eecdd2000559e8de;hpb=390c94da79af45e21594c432e835a8b37044eed5;p=wdq2wav.git

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 288a9c6..60e5842 100644
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.16 2003/02/12 07:24:32 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.19 2003/02/24 12:53:46 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,11 +26,12 @@
 
 #include <wdq2wav.h>
 
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.16 2003/02/12 07:24:32 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.19 2003/02/24 12:53:46 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
 bool g_debug = false;
+bool g_ignore_zero = false;
 
 
 #ifdef WIN32
@@ -107,12 +108,13 @@ usage (const char* progname)
 {
   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 << "  -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";
 }
 
 
@@ -124,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;
@@ -141,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);
@@ -254,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 <<
@@ -285,7 +291,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,9 +437,6 @@ bool get_float8 (int fd, double& f)
 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];
@@ -462,7 +465,7 @@ WindaqChannel::read_channel_data ()
 
   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;
   for (i = 0; i < r_wdq.m_nSamples; i++) {
     if (read (fd, sample_row, row_bytes) != row_bytes) {
       std::ostringstream os;
@@ -511,12 +514,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;
@@ -543,8 +554,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;
-      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);
@@ -626,9 +641,6 @@ WavFile::fill_header ()
 bool
 WavFile::WriteFile ()
 {
-  unsigned short int tmp2;
-  unsigned int tmp4;
-
   if (! m_valid)
     return false;
 
@@ -694,7 +706,7 @@ WavFile::Play ()
     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;