Changeset 220 for libmpc/branches/r2d/mpcenc/mpcenc.c

Timestamp:

02/17/07 18:49:10 (18 years ago)

Author:

r2d

Message:

• updated according to the spec
• now reads / write beginning / end silences, but decoder does not care.
• please test !

File:

• libmpc/branches/r2d/mpcenc/mpcenc.c (modified) (3 diffs)

libmpc/branches/r2d/mpcenc/mpcenc.c

@@ -1611 +1611 @@
         writeMagic(&e);
         writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
-                                           m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels, 0, 0, 0, 0);
-        si_size = writeBlock(&e, "SI", MPC_TRUE, 0);
-        writeEncoderInfo(&e, m.FullQual, m.PNS > 0, MPPENC_MAJOR, MPPENC_MINOR,
-                                          MPPENC_IMPLEMENT, MPPENC_BUILD);
+                                           m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels);
+        si_size = writeBlock(&e, "SH", MPC_TRUE, 0);
+        writeGainInfo ( &e, 0, 0, 0, 0);
+        writeBlock(&e, "RG", MPC_FALSE, 0);
+        writeEncoderInfo(&e, m.FullQual, m.PNS > 0, MPCENC_MAJOR, MPCENC_MINOR,
+                                          MPCENC_BUILD);
         writeBlock(&e, "EI", MPC_FALSE, 0);
         e.seek_ptr = ftell(e.outputFile);
         writeBits (&e, 0, 8);
         writeBits (&e, 0, 32); // jump 40 bits for seek table pointer
-        writeBlock(&e, "SP", MPC_FALSE, 0); // reserve space for seek pointer
+        writeBlock(&e, "SO", MPC_FALSE, 0); // reserve space for seek offset
 
 
@@ -1724 +1726 @@
                 }
                 e.block_cnt++;
-                writeBlock(&e, "AD", MPC_FALSE, 0);
+                writeBlock(&e, "AP", MPC_FALSE, 0);
         }
         writeSeekTable(&e);
@@ -1734 +1736 @@
                 fseek(e.outputFile, e.seek_ref + 4, SEEK_SET);
                 writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
-                                                   m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels, 0, 0, 0, 0);
-                writeBlock(&e, "SI", MPC_TRUE, si_size);
+                                                   m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels);
+                writeBlock(&e, "SH", MPC_TRUE, si_size);
                 fseek(e.outputFile, 0, SEEK_END);
         }