Changeset 149 for libmpc/branches/r2d/libmpcenc/encode_sv7.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/encode_sv7.c (modified) (5 diffs)

libmpc/branches/r2d/libmpcenc/encode_sv7.c

@@ -76 +76 @@
         e->Overflows = 0;
         e->seek_pos = 0;
-}
-
+        e->block_cnt = 0;
+        e->seek_pwr = 1;
+}
+
+// writes replay gain info
+static void writeGainInfo ( mpc_encoder_t * e )
+{
+        writeBits ( e, 1,  8 ); // version
+        writeBits ( e, 0,  16 ); // Title gain
+        writeBits ( e, 0,  16 ); // Title peak
+        writeBits ( e, 0,  16 ); // Album gain
+        writeBits ( e, 0,  16 ); // Album peak
+}
 
 // writes SV8-header
@@ -88 +99 @@
                                   const unsigned int  ChannelCount)
 {
-        unsigned char samplesCount[10];
-        int samplesCountLen = encodeSize(SamplesCount, (char *)samplesCount, MPC_FALSE);
-        int i;
+        unsigned char tmp[10];
+        int i, len = encodeSize(SamplesCount, (char *)tmp, MPC_FALSE);
+
+        len = encodeSize(len + 4, (char *)tmp, MPC_TRUE);
+        writeBits ( e, tmp[0]  , 8 );
 
     writeBits ( e, 0x08,  8 );    // StreamVersion
 
-        for( i = 0; i < samplesCountLen; i++) // nb of samples
-                writeBits ( e, samplesCount[i]  , 8 );
+        len = encodeSize(SamplesCount, (char *)tmp, MPC_FALSE);
+        for( i = 0; i < len; i++) // nb of samples
+                writeBits ( e, tmp[i]  , 8 );
 
         switch ( SampleFreq ) {
@@ -110 +124 @@
         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
+
+        writeGainInfo(e);
 }
 
@@ -128 +145 @@
         writeBits ( e, version_implement,  4 );
         writeBits ( e, version_build,  8 );
-}
-
-// writes replay gain info
-void writeGainInfo ( mpc_encoder_t * e )
-{
-        writeBits ( e, 1,  8 ); // version
-        writeBits ( e, 0,  16 ); // Title gain
-        writeBits ( e, 0,  16 ); // Title peak
-        writeBits ( e, 0,  16 ); // Album gain
-        writeBits ( e, 0,  16 ); // Album peak
 }
 
@@ -417 +424 @@
         e->framesInBlock++;
         if (e->framesInBlock == FRAMES_PER_BLOCK) {
-                e->seek_table[e->seek_pos] = ftell(e->outputFile);
-                e->seek_pos++;
+                if ((e->block_cnt & ((1 << e->seek_pwr) - 1)) == 0) {
+                        e->seek_table[e->seek_pos] = ftell(e->outputFile);
+                        e->seek_pos++;
+                }
+                e->block_cnt++;
                 writeBlock(e, "AD", MPC_FALSE);
         }