Changeset 71 for mppenc/branches/r2d/src/mppenc.c

Timestamp:

10/07/06 02:49:28 (18 years ago)

Author:

r2d

Message:

• fixed a LOT of bugs
• fixed a bug that took me 2 days to find :)
• remember to ALWAYS use -Wall with a C compiler (C++ is great !!!)
• files can be played, but are not bit identical with the 1.15w encoder (the last digits of floats are not the same) - must be fixed.

File:

• mppenc/branches/r2d/src/mppenc.c (modified) (6 diffs)

mppenc/branches/r2d/src/mppenc.c

@@ -683 +683 @@
                 memcpy ( errorL [Band], errorL[Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             }
-        } else {
         }
 
@@ -694 +693 @@
                 memcpy ( errorR [Band], errorR [Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             }
-        } else {
         }
     }
@@ -1035 +1033 @@
                         if ( 2 != sscanf ( argv[k], "%f,%f", &(m->KBD1), &(m->KBD2) ))
                 { stderr_printf ( "%s: missing two arguments", arg ); return -1; }
-            Init_FFT ();
+            Init_FFT (m);
         }
         else if ( 0 == strcmp ( arg, "fadein") ) {                                      // FadeInTime
@@ -1592 +1590 @@
 
     // initialize tables which must be initialized once and only once
+
+        m.SCF_Index_L = (int*) SCF_Index_L;
+        m.SCF_Index_R = (int*) SCF_Index_R;
+
 #ifdef FAST_MATH
     Init_FastMath ();                           // check if something has to be done for each file !!
 #endif
     Init_SV7 ();
+        Init_Skalenfaktoren ();
         Init_Psychoakustik (&m);
-        SetQualityParams (&m, 5.0);
-    Init_Psychoakustiktabellen (&m);
-        Init_Skalenfaktoren ();
         Init_FPU ();
         Init_ANS ();
@@ -1746 +1746 @@
     WriteHeader_SV7 ( &e, m.Max_Band, MainQual, m.MS_Channelmode > 0, LastValidFrame, LastValidSamples, PNS > 0 ? 0x17 : 0x07, m.SampleFreq );
 
+
     // initialize timer
     ShowProgress (&m, 0, SamplesInWAVE, e.BufferedBits );
@@ -1849 +1850 @@
         memmove ( Main.S, Main.S + BLOCK, CENTER * sizeof(float) );
 
-                if ( AllSamplesRead + BLOCK > SamplesInWAVE )
-                {
-                        int n = 0;
-                }
-
         // read samples
         CurrentRead     = Read_WAV_Samples ( &Wave, (int)minf(BLOCK, SamplesInWAVE - AllSamplesRead), &Main, CENTER, ScalingFactorl, ScalingFactorr, &Silence );