X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;fp=wdq2wav.cpp;h=3e5d7498cec955908607d6c5a7025192ee7f2f87;hb=a63e2457f31fde5bdd01704aa6d3cf806f8b0688;hp=03b6557fa6b5ed38638ca46f1ce5e1e6be749b1b;hpb=8ddc5f8ddd4b1f33f797b767cacf8d26e4392e6b;p=wdq2wav.git

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 03b6557..3e5d749 100644
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -335,6 +335,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<double*>(buf));
+
+  return true;
+}
+
 bool
 WindaqFile::ReadHeader ()
 {
@@ -349,7 +368,9 @@ WindaqFile::ReadHeader ()
   lseek (0, 0, SEEK_SET);
   if (! read_int2 (m_fd, tmp2))
     return false;
-
+  m_format = (tmp2 & 0xFF00) >> 8;
+  printf ("format=%d\n",m_format);
+  printf ("tmp2=%4x\n", tmp2);
   m_nChannels = tmp2 & 0x1f;
   m_sr_denom = (tmp2 & 0x7fff) >> 5;
   m_sr_numer = (tmp2 & 0x8000) << 1;
@@ -358,8 +379,6 @@ WindaqFile::ReadHeader ()
     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 +387,25 @@ WindaqFile::ReadHeader ()
   
   if (! read_int2 (m_fd, m_nHeader_bytes))
     return false;
-  
+
+  m_nMaxChannels = (m_nHeader_bytes - 112) / 36;
+  printf ("m_nMaxChannels = %d\n", m_nMaxChannels);
+
   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;
+  printf ("time_between_channel_samples=%lf\n", m_time_between_channel_samples);
+
+  if (m_format == 0 || m_format == 1)
+	 m_sample_rate = (double) m_nChannels / m_time_between_channel_samples;
+  else		
+	  m_sample_rate = (double) m_sr_numer / (double) (m_sr_denom * m_nChannels);
+
   lseek (m_fd, 36, SEEK_SET);
   if (! read_int4 (m_fd, m_time_acq_start))
     return false;
@@ -395,7 +427,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 +451,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<double*>(buf));
-
-  return true;
-}
-
-
 bool
 WindaqChannel::read_channel_data ()
 {
@@ -450,10 +461,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 +476,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];