fix decode errors

slmdev · May 27, 2023 · 77d01e6 · MartinEesmaa · May 28, 2023 · slmdev
1 parent 120b067
commit 77d01e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/src/libsac/libsac.cpp b/src/libsac/libsac.cpp
@@ -292,10 +292,10 @@ void FrameCoder::PredictStereoFrame(const SacProfile &profile,int ch0,int ch1,in
   Predictor::tparam param;
   SetParam(param,profile,optimize);
   Predictor pr(param);
-  int lag=param.nS1;
-  int j=-lag;
+  //int lag=param.nS1;
+  //int j=-lag;
 
-  #if 1
+  #if 0
   const int32_t minval=-(1<<15);
   const int32_t maxval=(1<<15);
 
@@ -582,7 +582,7 @@ void FrameCoder::Optimize(SacProfile &profile,const std::vector<int>&params_to_o
   #endif
   }
 
-  #if 1
+  #if 0
   std::cout << "\n[";
   for (auto i:params_to_optimize)
     std::cout << profile.coefs[i].vdef << ' ';
@@ -629,11 +629,11 @@ void FrameCoder::AnalyseMonoChannel(int ch, int numsamples)
     }
     framestats[ch].mean = (sum) / numsamples;
 
-    if (framestats[ch].mean > 0) {
+    /*if (framestats[ch].mean != 0) {
       for (int i=0;i<numsamples;i++) src[i]-=framestats[ch].mean;
-    }
+    }*/
+
 
-    /*
     int32_t minval = std::numeric_limits<int32_t>::max();
     int32_t maxval = std::numeric_limits<int32_t>::min();
     for (int i=0;i<numsamples;i++) {
@@ -643,7 +643,7 @@ void FrameCoder::AnalyseMonoChannel(int ch, int numsamples)
     }
     framestats[ch].minval = minval;
     framestats[ch].maxval = maxval;
-    std::cout << framestats[ch].minval << ' ' << framestats[ch].maxval << '\n';*/
+    //std::cout << "stats: " << numsamples << " " << framestats[ch].minval << ' ' << framestats[ch].maxval << "\n\n";
   }
 }
 
@@ -677,12 +677,12 @@ void FrameCoder::Predict()
 void FrameCoder::Unpredict()
 {
   if (numchannels_==2) UnpredictStereoFrame(baseprofile,0,1,numsamples_);
-  for (int ch=0;ch<numchannels_;ch++) {
-    if (framestats[ch].mean > 0) {
+  /*for (int ch=0;ch<numchannels_;ch++) {
+    if (framestats[ch].mean != 0) {
       int32_t *dst=&(samples[ch][0]);
       for (int i=0;i<numsamples_;i++) dst[i] += framestats[ch].mean;
     }
-  }
+  }*/
   //else for (int ch=0;ch<numchannels;ch++) UnpredictMonoFrame(ch,numsamples);
 }
 

diff --git a/src/libsac/libsac.h b/src/libsac/libsac.h
@@ -8,8 +8,8 @@
 
 class FrameCoder {
   public:
-    const static int size_profile_bytes_normal=34*4;
-    const static int size_profile_bytes_high=42*4;
+    const static int size_profile_bytes_normal=35*4;
+    const static int size_profile_bytes_high=44*4;
     struct coder_ctx {
       enum SearchCost {L1,Entropy,Golomb,Bitplane};
       enum SearchMethod {DDS,GRS};

diff --git a/src/main.cpp b/src/main.cpp
@@ -2,7 +2,7 @@
 
 int main(int argc,char *argv[])
 {
-  std::cout << "Sac v0.6.2 - Lossless Audio Coder (c) Sebastian Lehmann\n";
+  std::cout << "Sac v0.6.3 - Lossless Audio Coder (c) Sebastian Lehmann\n";
   std::cout << "compiled on " << __DATE__ << " ";
   #ifdef __x86_64
     std::cout << "(64-bit)";

diff --git a/src/opt/dds.h b/src/opt/dds.h
@@ -50,7 +50,6 @@ class DDS : public Opt {
           std::cout << '\n';*/
         }
         nfunc++;
-        std::cout << "dds: " << nfunc << '\r';
       }
       return opt_ret{fbest,xbest};
     }