Changeset 87 for mppenc/branches/zorg/src/mppenc.c

Timestamp:

11/03/06 01:44:02 (17 years ago)

Author:

zorg

Message:

various cleanup

File:

• mppenc/branches/zorg/src/mppenc.c (modified) (5 diffs)

mppenc/branches/zorg/src/mppenc.c

@@ -39 +39 @@
 int           PredictionBands =  0;
 int           CombPenalities  = -1;
-extern float  KBD1            =  2;
-extern float  KBD2            = -1.;
+float         KBD1            =  2;
+float         KBD2            = -1.;
 int           DisplayUpdateTime = 1;
 int           APE_Version     = 2000;
@@ -334 +334 @@
              "  --radio          (--quality 4.00)   medium quality        (~ 130 kbps)\n"
              "  --standard       (--quality 5.00)   high quality, (dflt)  (~ 180 kbps)\n"
-             "  --extreme        (--quality 6.00)   excellent quality     (~ 210 kbps)\n"
+             "  --insane         (--quality 7.00)   excellent quality     (~ 240 kbps)\n"
              "\n"
 
@@ -340 +340 @@
              "  mppenc inputfile.wav\n"
              "  mppenc inputfile.wav outputfile.mpc\n"
-             "  mppenc --extreme inputfile.wav outputfile.mpc\n"
+             "  mppenc --insane inputfile.wav outputfile.mpc\n"
              "  mppenc --silent --radio inputfile.wav outputfile.mpc\n"
              "\n"
-             "For further information see the file 'MANUAL.TXT' or use option --longhelp.\n" );
+             "For further information use option --longhelp.\n" );
 }
 
@@ -1804 +1804 @@
             }
 
-            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, Power_L, Transient );   // allocate bits for left + right channel
-            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, Power_R, Transient );
+            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, (const SCFTriple*) Power_L, Transient );   // allocate bits for left + right channel
+            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, (const SCFTriple*) Power_R, Transient );
 
             Quantisierung ( Max_Band, Res_L, Res_R, X, Q );             // quantize samples
@@ -1835 +1835 @@
         memmove ( Main.S, Main.S + BLOCK, CENTER * sizeof(float) );
 
-                if ( AllSamplesRead + BLOCK > SamplesInWAVE )
-                {
-                        int n = 0;
-                }
+                //if ( AllSamplesRead + BLOCK > SamplesInWAVE )
+                //{
+                //      int n = 0;
+                //}
 
         // read samples