r8652: identify packed files

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index fcc782cb8634d458696aa293e1f74e89efde723f..39b5a81c693ce2a0e87ae2efffe7c02cf471c89b 100644 (file)
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -237,6 +237,15 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p
     }
     return false;
   }
+
+  if (wdq.any_packed_channels()) {
+         std::ostringstream os;
+         os << "File contains 'packed' channels." << std::endl;
+         os << "Convert to 'Advanced CODAS headers' before processing with wdq2wav.";
+         error_msg (os.str().c_str());
+         return false;
+  }
+
   if (! g_quiet || g_verbose || g_debug) {
     std::ostringstream os1;
        os1 << "File: " << wdq_fname;
@@ -326,6 +335,16 @@ WindaqFile::~WindaqFile ()
     close (m_fd);
 }
 
+bool read_int1 (int fd, unsigned char& n)
+{
+  unsigned char tmp1;
+  if (read (fd, &tmp1, 1) != 1)
+    return false;
+
+  n = tmp1;
+  return true;
+}
+
 bool read_int2 (int fd, unsigned short int& n)
 {
   unsigned char tmp1;
@@ -376,8 +395,6 @@ bool read_float8 (int fd, double& f)
 bool
 WindaqFile::ReadHeader ()
 {
-  unsigned short int tmp2;
-
   m_valid = false;
   if ((m_fd = open (m_strFile.c_str(), O_RDONLY | O_BINARY)) < 0) {
     m_error = "Unable to open file";
@@ -385,45 +402,68 @@ WindaqFile::ReadHeader ()
   }
 
   lseek (0, 0, SEEK_SET);
-  if (! read_int2 (m_fd, tmp2))
+  unsigned short int element1;
+  if (! read_int2 (m_fd, element1))
     return false;
 
-  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;
+  short unsigned int byte1 = (element1 & 0xFF00) >> 8;
+  short unsigned int byte2 = element1 & 0xFF;
   if (byte1 == 0 || byte1 == 1) {
          m_bLegacy_format = false;
+         m_sr_denom = m_sr_numer = 0;
   } else {
+         m_sr_denom = (element1 & 0x7fff) >> 5;
+         m_sr_numer = (element1 & 0x8000) << 1;
       m_bLegacy_format = true;
   }
-  if (! read_int2 (m_fd, tmp2))
+  unsigned short int element2;
+  if (! read_int2 (m_fd, element2))
     return false;
 
-  m_sr_numer |= tmp2;
-  if (! read_int2 (m_fd, tmp2))
+  if (m_bLegacy_format)
+         m_sr_numer |= element2;
+
+  unsigned char element3;
+  if (! read_int1 (m_fd, element3))
     return false;
+  m_channel_offset = element3;
+  if (g_debug)
+         std::cout << "Channel offset: " << m_channel_offset << std::endl;
 
-  m_channel_offset = tmp2 & 0xFF;
-  m_nBytes_channel_header = tmp2 >> 8;
+  unsigned char element4;
+  if (! read_int1 (m_fd, element4))
+    return false;
+  m_nBytes_channel_header = element4;
+  if (g_debug)
+         std::cout << "Channel header bytes: " << m_nBytes_channel_header << std::endl;
   
-  if (! read_int2 (m_fd, m_nHeader_bytes))
+  unsigned short int element5;
+  if (! read_int2 (m_fd, element5))
     return false;
+  m_nHeader_bytes = element5;
+  if (g_debug)
+         std::cout << "Header bytes: " << m_nHeader_bytes << std::endl;
 
   m_nMaxChannels = (m_nHeader_bytes - 112) / 36;
   if (m_nMaxChannels >= 144)
        m_nChannels = byte2 & 0xFF;
   else
-         m_nChannels = byte2 & 0x1F;
+    m_nChannels = byte2 & 0x1F;
 
-  if (! read_int4 (m_fd, m_nData_bytes))
+  unsigned int element6;
+  if (! read_int4 (m_fd, element6))
     return false;
+  m_nData_bytes = element6;
+  if (g_debug)
+         std::cout << "Data bytes: " << m_nData_bytes << std::endl;
 
   m_nSamples = (m_nData_bytes / m_nChannels) / 2;
 
   lseek (m_fd, 28, SEEK_SET);
-  if (! read_float8 (m_fd, m_time_between_channel_samples))
+  double element13;
+  if (! read_float8 (m_fd, element13))
          return false;
+  m_time_between_channel_samples = element13;
 
   if (m_bLegacy_format)
      m_sample_rate = (double) m_sr_numer / (double) (m_sr_denom * m_nChannels);
@@ -437,21 +477,64 @@ WindaqFile::ReadHeader ()
   if (! read_int4 (m_fd, m_time_acq_stop))
     return false;
 
+  lseek (m_fd, 100, SEEK_SET);
+  unsigned short int element27;
+  if (! read_int2 (m_fd, element27))
+         return false;
+
+  m_bHires = (element27 & 0x0001) ? true : false;
+  if (g_debug) {
+         std::cout << "High resolution: ";
+         if (m_bHires)
+                 std::cout << "Yes";
+         else
+                 std::cout << "No";
+
+         std::cout << std::endl;
+  }
+
   // Verify Windaq signature
   lseek (m_fd, m_nHeader_bytes - 2, SEEK_SET);
-  if (! read_int2 (m_fd, tmp2))
+  unsigned short int element35;
+  if (! read_int2 (m_fd, element35))
     return false;
 
-  if (tmp2 != 0x8001) {
+  if (element35 != 0x8001) {
     std::ostringstream os;
-    m_error = "File is not a valid WinDAQ file";
+       m_error = "Incorrect signagure: file is not a valid WinDAQ file";
     return false;
   }
 
   m_valid = true;
   return true;
 }
+
+bool
+WindaqFile::any_packed_channels ()
+{
+       for (int iChannel = 0; iChannel < m_nChannels; iChannel++)
+               if (is_channel_packed (iChannel))
+                       return true;
+
+       return false;
+}
+
+bool
+WindaqFile::is_channel_packed (const int channel)
+{
+  long iStart = m_channel_offset + channel * m_nBytes_channel_header;
+
+  lseek (m_fd, iStart + 31, SEEK_SET);
+  unsigned char iReadings_per_data_point;
+  if (! read_int1 (m_fd, iReadings_per_data_point))
+       return false;
+
+  if (iReadings_per_data_point > 1)
+         return true;
   
+  return false;
+}
+
 WindaqChannel::WindaqChannel (WindaqFile& wdq, const int channel)
   : r_wdq(wdq), m_data(0), m_slope(0), m_intercept (0), m_channel(channel),
     m_valid(false)
@@ -524,7 +607,10 @@ WindaqChannel::read_channel_data ()
     unsigned char c = p[0]; p[0] = p[1]; p[1] = c; 
 #endif
 
-    signed short int value = v >> 2;
+    signed short int value = v;
+       if (! r_wdq.m_bHires)
+               value >>= 2;
+
     m_data[i] = value;
     total_data += value;
     
@@ -605,6 +691,7 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
       return;
 
     unsigned long int i;
+
     for (i = 0; i < m_nSamples; i++) {
       double value = input[i];
       value = (slope * value) + intercept;

diff --git a/wdq2wav.h b/wdq2wav.h
index a5076c0b653d91fa3e8fc9d2778769fbc4f52307..aa7c43ae1be9bf5c4b904c2b6e2372036fdd0d56 100644 (file)
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -73,6 +73,7 @@ public:
   std::string m_error;
   int m_fd;
   bool m_bLegacy_format;
+  bool m_bHires;
   int m_nMaxChannels;
   int m_nChannels;
   unsigned long int m_nSamples;
@@ -84,6 +85,9 @@ public:
   unsigned int m_time_acq_start;
   unsigned int m_time_acq_stop;
   double m_time_between_channel_samples;
+
+  bool any_packed_channels();
+  bool is_channel_packed(int iChannel);
 };
 
 class WindaqChannel