Changeset 64 for mppenc/branches/r2d/libmpcenc/encode_sv7.c

Timestamp:

09/29/06 16:55:39 (18 years ago)

Author:

r2d

Message:

• added libmpcenc and a common directory
• can compile libmpcenc and libmpcpsy don't know about linking

Location:

mppenc/branches/r2d/libmpcenc

Files:

• . (added)
• encode_sv7.c (moved) (moved from mppenc/branches/r2d/src/encode_sv7.c) (8 diffs)

mppenc/branches/r2d/libmpcenc/encode_sv7.c

@@ -18 +18 @@
  */
 
-#include "mppenc.h"
+#include <stdlib.h>
+
+#include "libmpcenc.h"
+
+// huffsv7.c
+extern Huffman_t         HuffHdr  [10];         // contains tables for SV7-header
+extern Huffman_t         HuffSCFI [ 4];         // contains tables for SV7-scalefactor select
+extern Huffman_t         HuffDSCF [16];         // contains tables for SV7-scalefactor coding
+extern const Huffman_t*  HuffQ [2] [8];         // points to tables for SV7-sample coding
 
 /*
@@ -55 +63 @@
                   const unsigned int  Profile,
                   const unsigned int  MS_on,
-                  const Uint32_t      TotalFrames,
+                  const mpc_uint32_t  TotalFrames,
                   const unsigned int  SamplesRest,
                   const unsigned int  StreamVersion,
@@ -102 +110 @@
 
 void
-FinishBitstream ( void )
-{
-    Buffer [Zaehler++] = dword;         // Assigning the "last" word
+FinishBitstream ( mpc_encoder* e )
+{
+    e->Buffer [e->Zaehler++] = e->dword;         // Assigning the "last" word
 }
 
@@ -114 +122 @@
         }                                                    \
         else {                                               \
-            if ( new < 0 ) new = 0, Overflows++;             \
+            if ( new < 0 ) new = 0, e->Overflows++;          \
             WriteBits ( Table[15].Code, Table[15].Length );  \
             WriteBits ( (unsigned int)new, 6 );              \
@@ -126 +134 @@
         }                                                    \
         else {                                               \
-            if ( new < 0 ) new = 0, Overflows++;             \
+            if ( new < 0 ) new = 0, e->Overflows++;          \
             WriteBits ( Table[15].Code, Table[15].Length );  \
             WriteBits ( (unsigned int)new, 6 );              \
@@ -161 +169 @@
 // formatting and writing SV7-bitstream for one frame
 void
-WriteBitstream_SV7 ( const int               MaxBand,
+WriteBitstream_SV7 ( mpc_encoder* e,
+                                         const int               MaxBand,
                      const SubbandQuantTyp*  Q )
 {
@@ -180 +189 @@
     WriteBits ( (unsigned int)Res_L[0], 4 );                            // subband 0
     WriteBits ( (unsigned int)Res_R[0], 4 );
-    if ( MS_Channelmode > 0  &&  !(Res_L[0]==0  &&  Res_R[0]==0) )
+    if ( e->MS_Channelmode > 0  &&  !(Res_L[0]==0  &&  Res_R[0]==0) )
          WriteBits ( MS_Flag[0] , 1 );
 
@@ -205 +214 @@
             WriteBits ( Res_R[n]     , 4               );
         }
-        if ( MS_Channelmode > 0  &&  !(Res_L[n]==0 && Res_R[n]==0) )
+        if ( e->MS_Channelmode > 0  &&  !(Res_L[n]==0 && Res_R[n]==0) )
             WriteBits ( MS_Flag[n], 1 );
     }