v0.6.5

Author: slmdev

src/cmdline.cpp

@@ -125,8 +125,17 @@ int CmdLine::Parse(int argc,char *argv[])
        else if (key=="--LIST") mode=LIST;
        else if (key=="--LISTFULL") mode=LISTFULL;
        else if (key=="--NORMAL") opt.profile=0;
-       else if (key=="--HIGH") opt.profile=1;
-       else if (key=="--OPTIMIZE") {
+       else if (key=="--HIGH") {
+         opt.profile=1;
+         opt.optimize=1;
+         opt.optimize_mode=2;
+         opt.sparse_pcm=1;
+       } else if (key=="--VERYHIGH") {
+         opt.profile=1;
+         opt.optimize=1;
+         opt.optimize_mode=3;
+         opt.sparse_pcm=1;
+       } else if (key=="--OPTIMIZE") {
          opt.optimize=1;
          if (val=="FAST") {
            opt.optimize_mode=0;

src/cmdline.h

@@ -8,14 +8,16 @@
 const char SACHelp[] =
 "usage: sac [--options] input output\n\n"
 "  --encode         encode input.wav to output.sac (default)\n"
-"   --normal        normal compression (default)\n"
-"   --high          high compression, slow\n"
-"   --optimize=#  enable frame-based optimization\n"
-"     #=fast|normal|high|veryhigh|insane\n"
-"   --sparse-pcm    enable pcm modelling\n"
+"  --normal         normal compression (default)\n"
+"  --high           high compression, slow\n"
+"  --veryhigh       very high compression, really slow\n"
 "  --decode         decode input.sac to output.wav\n"
-"  --list           list info about input.[wav|sac]\n"
-"  --listfull       verbose info about input\n\n";
+"  --list           list info about input.sac\n"
+"  --listfull       verbose info about input\n\n"
+"  advanced options\n"
+"   --optimize=#    frame-based optimization\n"
+"     #=fast|normal|high|veryhigh|insane\n"
+"   --sparse-pcm    enable pcm modelling\n";
 
 class CmdLine {
   enum CMODE {ENCODE,DECODE,LIST,LISTFULL};

src/file/file.h

@@ -2,6 +2,7 @@
 #define FILE_H
 
 //#include "../global.h"
+#include <cstdint>
 #include <string>
 #include <vector>
 #include <fstream>

src/global.h

@@ -27,6 +27,6 @@ typedef std::vector <double*>ptr_vec1D;
 template <class T> T abs(T a){return ((a) < 0)?-(a):(a);}
 template <class T> T div_signed(T val,T s){return val<0?-(((-val)+(1<<(s-1)))>>s):(val+(1<<(s-1)))>>s;};
 
-#define RNDINT(f) ((int)(f >= 0.0 ? (f + 0.5))
+#define RNDINT(f) ((int)(f >= 0.0 ? (f + 0.5) : (f - 0.5))
 
 #endif // GLOBAL_H