Changeset 116 for mppenc/branches/r2d/src/mppenc.c

Timestamp:

11/11/06 18:19:44 (17 years ago)

Author:

r2d

Message:

• added "EI" and "RG" blocks in output
• updated "SI" block according to the spec
• added "SE" block at the end of the stream

File:

• mppenc/branches/r2d/src/mppenc.c (modified) (4 diffs)

mppenc/branches/r2d/src/mppenc.c

@@ -59 +59 @@
 Bool_t        FrontendPresent = 0;      // Flag for frontend-detection
 Bool_t        XLevel          = 1;      // Encode extreme levels with relative SCFs
-const char    About []        = "MPC Encoder  " MPPENC_VERSION "  " MPPENC_BUILD "   (C) 1999-2005 Buschmann/Klemm/Piecha/MDT";
+
+#if MPPENC_MINOR % 2 == 0
+#define _cat(a,b,c,d) #a"."#b"."#c"."#d" --stable--"
+#else
+#define _cat(a,b,c,d) #a"."#b"."#c"."#d" --unstable--"
+#endif
+
+#define cat(a,b,c,d) _cat(a,b,c,d)
+#define MPPENC_VERSION cat(MPPENC_MAJOR,MPPENC_MINOR,MPPENC_IMPLEMENT,MPPENC_BUILD)
+
+const char    About []        = "MPC Encoder " MPPENC_VERSION " (C) 1999-2005 Buschmann/Klemm/Piecha/MDT";
 
 
@@ -1623 +1633 @@
 //     e.BufferedBits     = 0;
         writeMagic(&e);
-        WriteHeader_SV8 ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
-                                           0x08, m.PNS > 0, m.SampleFreq,
-                                           Wave.Channels > 2 ? 2 : Wave.Channels);
+        writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE,
+                                           m.SampleFreq, Wave.Channels > 2 ? 2 : Wave.Channels);
         writeBlock(&e, "SI", TRUE);
-
+        writeGainInfo(&e);
+        writeBlock(&e, "RG", FALSE);
+        writeEncoderInfo(&e, m.MainQual, m.PNS > 0, MPPENC_MAJOR, MPPENC_MINOR,
+                                          MPPENC_IMPLEMENT, MPPENC_BUILD);
+        writeBlock(&e, "EI", FALSE);
 
     // initialize timer
@@ -1731 +1744 @@
     // write the last incomplete block
         writeBlock(&e, "AD", FALSE);
+        writeBlock(&e, "SE", FALSE); // write end of stream block
     ShowProgress (&m, SamplesInWAVE, SamplesInWAVE, e.outputBits );
 
@@ -1769 +1783 @@
         FrontendPresent = SearchForFrontend (); // search for presence of Windows Frontend
         if ( FrontendPresent )
-            SendStartupMessage ( MPPENC_VERSION, 7, MPPENC_BUILD );
+            SendStartupMessage ( MPPENC_VERSION, 8);
     }