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

Timestamp:

10/02/06 23:20:16 (18 years ago)

Author:

r2d

Message:

• mppenc compiles and runs, but output is not playing

File:

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

mppenc/branches/r2d/src/mppenc.c

@@ -680 +680 @@
                 memcpy ( errorL [Band], errorL[Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             } else {
-                QuantizeSubband                 ( subq[Band].L, subx[Band].L, *resL, errorL [Band] );
+                                QuantizeSubband                 ( subq[Band].L, subx[Band].L, *resL, errorL [Band], MAX_NS_ORDER );
                 memcpy ( errorL [Band], errorL[Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             }
@@ -691 +691 @@
                 memcpy ( errorR [Band], errorR [Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             } else {
-                QuantizeSubband                 ( subq[Band].R, subx[Band].R, *resR, errorL [Band] );
+                                QuantizeSubband                 ( subq[Band].R, subx[Band].R, *resR, errorL [Band], MAX_NS_ORDER);
                 memcpy ( errorR [Band], errorR [Band] + 36, MAX_NS_ORDER * sizeof (**errorL) );
             }
@@ -1542 +1542 @@
 
 
-void
-                OverdriveReport ( mpc_encoder_t * e )
+void OverdriveReport ( mpc_encoder_t * e )
 {
         if ( e->Overflows > 0 ) {                                                // report internal clippings
@@ -1603 +1602 @@
         Init_ANS ();
         Klemm    ();
+
+        e.dword = 0;
+        e.filled = 32;
+        e.Zaehler = 0;
+        e.BufferedBits = 0;
+        e.Overflows = 0;
 
     // initialize PCM-data
@@ -1734 +1739 @@
     }
 
+        e.MS_Channelmode = m.MS_Channelmode;
     e.BufferedBits     = 0;
     LastValidFrame   = (SamplesInWAVE + BLOCK - 1) / BLOCK;
     LastValidSamples = (SamplesInWAVE + BLOCK - 1) - BLOCK * LastValidFrame + 1;
-    WriteHeader_SV7 ( m.Max_Band, MainQual, m.MS_Channelmode > 0, LastValidFrame, LastValidSamples, PNS > 0 ? 0x17 : 0x07, m.SampleFreq );
+    WriteHeader_SV7 ( &e, m.Max_Band, MainQual, m.MS_Channelmode > 0, LastValidFrame, LastValidSamples, PNS > 0 ? 0x17 : 0x07, m.SampleFreq );
 
     // initialize timer
@@ -1824 +1830 @@
         OldSilence      = Silence;
         OldBufferedBits = e.BufferedBits;
-        GetBitstreamPos    ( &bitstreampos );
-        WriteBits          ( 0, 20 );                                                      // Reserve 20 bits for jump-information
-        WriteBitstream_SV7 ( m.Max_Band, Q );                                                // write SV7-Bitstream
-        WriteBitsAt        ( (Uint32_t)(e.BufferedBits - OldBufferedBits - 20), 20, bitstreampos );      // Patch 20 bits for jump-information to the right value
+        GetBitstreamPos    ( &e, &bitstreampos );
+        WriteBits          ( &e, 0, 20 );                                                      // Reserve 20 bits for jump-information
+        WriteBitstream_SV7 ( &e, m.Max_Band, Q );                                                // write SV7-Bitstream
+        WriteBitsAt        ( &e, (Uint32_t)(e.BufferedBits - OldBufferedBits - 20), 20, bitstreampos );      // Patch 20 bits for jump-information to the right value
 
         if ( (Int)(time (NULL) - T) >= 0 ) {                            // output
@@ -1865 +1871 @@
 
         if ( N == LastValidFrame - 1 ) {
-            WriteBits ( LastValidSamples, 11 );
+            WriteBits ( &e, LastValidSamples, 11 );
             // fprintf ( stderr, "\nGltige Samples im letzten Frame: %4u   \n", LastValidSamples );
         }
@@ -1875 +1881 @@
 
     // write the last incomplete word to buffer, so it's written during the next flush
-    FinishBitstream();
+    FinishBitstream(&e);
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.BufferedBits );