Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
b7e64160c9
1 changed files with 45 additions and 2 deletions
  1. 45 2
      panda/src/mathutil/fftCompressor.cxx

+ 45 - 2
panda/src/mathutil/fftCompressor.cxx

@@ -412,6 +412,11 @@ bool FFTCompressor::
 read_reals(DatagramIterator &di, vector_float &array) {
   int length = di.get_int32();
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Reading real array of length " << length << "\n";
+  }
+
   if (_quality > 100) {
     // Special case: lossless output.
     for (int i = 0; i < length; i++) {
@@ -477,6 +482,11 @@ read_reals(DatagramIterator &di, vector_float &array) {
 ////////////////////////////////////////////////////////////////////
 bool FFTCompressor::
 read_hprs(DatagramIterator &di, vector_LVecBase3f &array) {
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Reading HPRS\n";
+  }
+
   if (_quality >= 103) {
     // If quality level is at least 103, we don't even convert hpr to
     // quat.
@@ -494,6 +504,10 @@ read_hprs(DatagramIterator &di, vector_LVecBase3f &array) {
       }
     }
 
+    if (mathutil_cat.is_spam()) {
+      mathutil_cat.spam()
+	<< "HPRS read directly, okflag = " << (int)okflag << "\n";
+    }
     return okflag;
   }
 
@@ -512,6 +526,10 @@ read_hprs(DatagramIterator &di, vector_LVecBase3f &array) {
     read_reals(di, qk);
 
   if (okflag) {
+    if (mathutil_cat.is_spam()) {
+      mathutil_cat.spam()
+	<< "Decomposing HPRS, length = " << qi.size() << "\n";
+    }
     nassertr(qi.size() == qj.size() && qj.size() == qk.size(), false);
     
     array.reserve(array.size() + qi.size());
@@ -542,6 +560,11 @@ read_hprs(DatagramIterator &di, vector_LVecBase3f &array) {
     }
   }
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "HPRS read, okflag = " << (int)okflag << "\n";
+  }
+
   return okflag;
 }
 
@@ -776,10 +799,20 @@ get_real_compress_plan(int length) {
     return (*pi).second;
   }
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Creating compress plan for length " << length << ".\n";
+  }
+
   rfftw_plan plan;
-  plan = rfftw_create_plan(length, FFTW_REAL_TO_COMPLEX, FFTW_MEASURE);
+  plan = rfftw_create_plan(length, FFTW_REAL_TO_COMPLEX, FFTW_ESTIMATE);
   _real_compress_plans.insert(RealPlans::value_type(length, plan));
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Got plan.\n";
+  }
+
   return plan;
 }
 
@@ -796,10 +829,20 @@ get_real_decompress_plan(int length) {
     return (*pi).second;
   }
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Creating decompress plan for length " << length << ".\n";
+  }
+
   rfftw_plan plan;
-  plan = rfftw_create_plan(length, FFTW_COMPLEX_TO_REAL, FFTW_MEASURE);
+  plan = rfftw_create_plan(length, FFTW_COMPLEX_TO_REAL, FFTW_ESTIMATE);
   _real_decompress_plans.insert(RealPlans::value_type(length, plan));
 
+  if (mathutil_cat.is_spam()) {
+    mathutil_cat.spam()
+      << "Got plan.\n";
+  }
+
   return plan;
 }