Changeset 204 for libmpc/branches/r2d/libmpcenc

Timestamp:

02/08/07 21:36:52 (18 years ago)

Author:

r2d

Message:

• file length should be OK for all files
• seems there is a bug at end of file

Location:

libmpc/branches/r2d/libmpcenc

Files:

• bitstream.c (modified) (4 diffs)
• encode_sv7.c (modified) (2 diffs)
• libmpcenc.h (modified) (2 diffs)

libmpc/branches/r2d/libmpcenc/bitstream.c

@@ -194 +194 @@
 }
 
-void writeBlock ( mpc_encoder_t * e, const char * key, const mpc_bool_t addCRC)
+mpc_uint32_t writeBlock ( mpc_encoder_t * e, const char * key, const mpc_bool_t addCRC, mpc_uint32_t min_size)
 {
         FILE * fp = e->outputFile;
@@ -200 +200 @@
         mpc_uint8_t * datas = e->buffer;
         char blockSize[10];
-        mpc_uint_t len;
+        mpc_uint32_t len;
 
         writeBits(e, 0, (8 - e->bitsCount) % 8);
@@ -206 +206 @@
 
         // write block header (key / length)
-        len = encodeSize(e->pos + 2 + (addCRC ? 4 : 0), blockSize, MPC_TRUE);
+        len = e->pos + 2 + (addCRC > 0) * 4;
+        if (min_size <= len)
+                min_size = len;
+        else {
+                mpc_uint32_t pad = min_size - len, i;
+                for(i = 0; i < pad; i++)
+                        writeBits(e, 0, 8);
+        }
+        len = encodeSize(min_size, blockSize, MPC_TRUE);
         fwrite(key, sizeof(char), 2, fp);
         fwrite(blockSize, sizeof(char), len, fp);
         e->outputBits += (len + 2) * 8;
-
 
         if (addCRC) {
@@ -236 +243 @@
         }
         e->framesInBlock = 0;
+
+        return min_size;
 }
 

libmpc/branches/r2d/libmpcenc/encode_sv7.c

@@ -24 +24 @@
 #include <mpc/minimax.h>
 
-// bitstream.c
-void writeBits (mpc_encoder_t * e, mpc_uint32_t input, unsigned int bits );
-unsigned int encodeSize(mpc_uint64_t, char *, mpc_bool_t);
-void encodeEnum(mpc_encoder_t * e, const mpc_uint32_t bits, const mpc_uint_t N);
-void encodeLog(mpc_encoder_t * e, mpc_uint32_t value, mpc_uint32_t max);
-void writeBlock ( mpc_encoder_t * e, const char * key, const mpc_bool_t addCRC);
-
-void       Init_Huffman_Encoder_SV7   ( void );
-
-void   Klemm ( void );
-
-void   Init_Skalenfaktoren             ( void );
+void Klemm ( void );
+void Init_Skalenfaktoren ( void );
 
 // huffsv7.c
@@ -358 +348 @@
                 }
                 e->block_cnt++;
-                writeBlock(e, "AD", MPC_FALSE);
+                writeBlock(e, "AD", MPC_FALSE, 0);
         }
 }

libmpc/branches/r2d/libmpcenc/libmpcenc.h

@@ -88 +88 @@
                                                  const int version_implement,
                                                  const int version_build );
- void writeBlock ( mpc_encoder_t * e, const char * key, const mpc_bool_t addCRC);
+ mpc_uint32_t writeBlock ( mpc_encoder_t *, const char *, const mpc_bool_t, mpc_uint32_t);
  void writeMagic (mpc_encoder_t * e);
  void writeBits (mpc_encoder_t * e, mpc_uint32_t input, unsigned int bits );
@@ -94 +94 @@
  void writeBitstream_SV8 ( mpc_encoder_t*, int);
 
+ unsigned int encodeSize(mpc_uint64_t, char *, mpc_bool_t);
+ void encodeEnum(mpc_encoder_t * e, const mpc_uint32_t bits, const mpc_uint_t N);
+ void encodeLog(mpc_encoder_t * e, mpc_uint32_t value, mpc_uint32_t max);
+
+