comparison trunk/src/Modules/Output/FileOutputHTK.cc @ 421:3b22559cd848

- Fix bug where the fram period wasn't propagating to the output file.

   if (file_handle_ == NULL) {
     LOG_ERROR(_T("Couldn't initialize file output."));
     return false;
   }
   if (!header_written_) {
-    WriteHeader(channel_count_ * buffer_length_, frame_period_ms_);
+    WriteHeader(channel_count_ * buffer_length_);
   }
   
   return true;
 }
 
 void FileOutputHTK::ResetInternal() {
   // Finalize and close the open file, if there is one.
   if (file_handle_ != NULL && !header_written_) {
-    WriteHeader(channel_count_ * buffer_length_, frame_period_ms_);
+    WriteHeader(channel_count_ * buffer_length_);
   }
   if (file_handle_ != NULL)
     CloseFile();
     
   // Now open and set up the new file.

               out_filename.c_str());
     return;
   }
   sample_count_ = 0;
   header_written_ = false;
-  WriteHeader(channel_count_ * buffer_length_, frame_period_ms_);
-}
-
-void FileOutputHTK::WriteHeader(int num_elements, float period_ms) {
+  WriteHeader(channel_count_ * buffer_length_);
+}
+
+void FileOutputHTK::WriteHeader(int num_elements) {
   if (header_written_)
     return;
 
   /* HTK format file: (taken from the HTK book - section 5.10.1)
    * Header: 12 bytes in total, contains:

    */
 
   // To be filled in when the file is done
   int32_t sample_count = 0;
 
-  int32_t sample_period = floor(1e4 * period_ms);
+  int32_t sample_period = floor(1e4 * frame_period_ms_);
   int16_t sample_size = num_elements * sizeof(float);  // NOLINT
 
   // User-defined coefficients with energy term
   int16_t parameter_kind = H_USER + H_E;
 

   if (file_handle_ == NULL)
     return false;
 
   // Write the first 4 bytes of the file
   // with how many samples there are in the file
+  // and the next 4 bytes with the frame period.
   fflush(file_handle_);
   rewind(file_handle_);
   fflush(file_handle_);
   int32_t samples = sample_count_;
   samples = ByteSwap32(samples);
+  int32_t sample_period = floor(1e4 * frame_period_ms_);
+  sample_period = ByteSwap32(sample_period);
   fwrite(&samples, sizeof(samples), 1, file_handle_);
+  fwrite(&sample_period, sizeof(sample_period), 1, file_handle_);
 
   // And close the file
   fclose(file_handle_);
   file_handle_ = NULL;
   header_written_ = false;