Changeset 149 for libmpc/branches/r2d/libmpcenc/bitstream.c

Timestamp:

11/23/06 19:17:14 (18 years ago)

Author:

r2d

Message:

• merged SI and RG blocks
• updated seek table according to the spec in mppenc

File:

• libmpc/branches/r2d/libmpcenc/bitstream.c (modified) (1 diff)

libmpc/branches/r2d/libmpcenc/bitstream.c

@@ -136 +136 @@
 void writeSeekTable (mpc_encoder_t * e)
 {
-        mpc_uint32_t tmp1, tmp2, i, len;
+        mpc_uint32_t i, len;
         mpc_uint32_t * table = e->seek_table;
         mpc_uint8_t tmp[10];
 
         // write the position to header
-        tmp1 = ftell(e->outputFile); // get the seek table position
-        tmp[0] = (mpc_uint8_t) (tmp1 >> 24);
-        tmp[1] = (mpc_uint8_t) (tmp1 >> 16);
-        tmp[2] = (mpc_uint8_t) (tmp1 >> 8);
-        tmp[3] = (mpc_uint8_t) tmp1;
-        fseek(e->outputFile, e->seek_ref + 3, SEEK_SET);
-        fwrite(tmp, sizeof(mpc_uint8_t), 4, e->outputFile);
-        fseek(e->outputFile, tmp1, SEEK_SET);
+        i = ftell(e->outputFile); // get the seek table position
+        len = encodeSize(i - e->seek_ptr, (char*)tmp, MPC_FALSE);
+        fseek(e->outputFile, e->seek_ptr + 3, SEEK_SET);
+        fwrite(tmp, sizeof(mpc_uint8_t), len, e->outputFile);
+        fseek(e->outputFile, i, SEEK_SET);
 
-        tmp1 = table[0];
-        tmp2 = table[1];
-
-        len = encodeSize(tmp1 - e->seek_ref, tmp, MPC_FALSE);
+        // write the seek table datas
+        len = encodeSize(e->seek_pos, (char*)tmp, MPC_FALSE);
         for( i = 0; i < len; i++)
                 writeBits ( e, tmp[i], 8 );
-        len = encodeSize(tmp2 - e->seek_ref, tmp, MPC_FALSE);
+        writeBits ( e, e->seek_pwr, 4 );
+
+        len = encodeSize(table[0] - e->seek_ref, (char*)tmp, MPC_FALSE);
         for( i = 0; i < len; i++)
                 writeBits ( e, tmp[i], 8 );
+        if (e->seek_pos > 1) {
+                len = encodeSize(table[1] - e->seek_ref, (char*)tmp, MPC_FALSE);
+                for( i = 0; i < len; i++)
+                        writeBits ( e, tmp[i], 8 );
+        }
 
         for( i = 2; i < e->seek_pos; i++){
-                int code = table[i] - 2 * tmp2 + tmp1;
-                tmp1 = tmp2;
-                tmp2 = table[i];
-                if (code >= 0) {
-                        writeBits(e, 0, 1);
-                        encodeGolomb(e, code, 10);
-                } else {
-                        writeBits(e, 1, 1);
-                        encodeGolomb(e, -code, 10);
-                }
+                int code = (table[i] - 2 * table[i-1] + table[i-2]) << 1;
+                if (code < 0)
+                        code = -code | 1;
+                encodeGolomb(e, code, 12);
         }
 }