Changeset 150 for libmpc/branches/r2d/libmpcenc

Timestamp:

11/24/06 19:18:18 (18 years ago)

Author:

r2d

Message:

• updated libmpcenc / libmpcdec according to the spec
• added seek table loading from file in libmpcdec

Location:

libmpc/branches/r2d/libmpcenc

Files:

• encode_sv7.c (modified) (3 diffs)
• libmpcenc.h (modified) (1 diff)

libmpc/branches/r2d/libmpcenc/encode_sv7.c

@@ -105 +105 @@
         writeBits ( e, tmp[0]  , 8 );
 
-    writeBits ( e, 0x08,  8 );    // StreamVersion
+    writeBits ( e, 8,  8 );    // StreamVersion
 
         len = encodeSize(SamplesCount, (char *)tmp, MPC_FALSE);
@@ -112 +112 @@
 
         switch ( SampleFreq ) {
-                case 44100: writeBits ( e, 0, 4 ); break;
-                case 48000: writeBits ( e, 1, 4 ); break;
-                case 37800: writeBits ( e, 2, 4 ); break;
-                case 32000: writeBits ( e, 3, 4 ); break;
+                case 44100: writeBits ( e, 0, 3 ); break;
+                case 48000: writeBits ( e, 1, 3 ); break;
+                case 37800: writeBits ( e, 2, 3 ); break;
+                case 32000: writeBits ( e, 3, 3 ); break;
                 default   : fprintf(stderr, "Internal error\n");// FIXME : stderr_printf ( "Internal error\n");
                 exit (1);
@@ -123 +123 @@
         writeBits ( e, MaxBand - 1  ,  5 );    // Bandwidth
         writeBits ( e, MS_on        ,  1 );    // MS-Coding Flag
-        writeBits ( e, FRAMES_PER_BLOCK_PWR,  4 );    // frames per block (log2 unit)
-        writeBits ( e, 0, 6 );    // unused
+        writeBits ( e, FRAMES_PER_BLOCK_PWR >> 1,  3 );    // frames per block (log4 unit)
 
         writeGainInfo(e);

libmpc/branches/r2d/libmpcenc/libmpcenc.h

@@ -28 +28 @@
 
 // bitstream.c
-#define FRAMES_PER_BLOCK_PWR 6
+#define FRAMES_PER_BLOCK_PWR 6 // MUST be even
 #define FRAMES_PER_BLOCK (1 << FRAMES_PER_BLOCK_PWR)
 #define BUFFER_FULL         (4352 * FRAMES_PER_BLOCK)         // 34490 bit/frame  1320.3 kbps