Changeset 116 for mppenc/branches/r2d/libmpcenc

Timestamp:

11/11/06 18:19:44 (18 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

Location:

mppenc/branches/r2d/libmpcenc

Files:

• encode_sv7.c (modified) (3 diffs)
• libmpcenc.h (modified) (1 diff)

mppenc/branches/r2d/libmpcenc/encode_sv7.c

@@ -80 +80 @@
 // writes SV8-header
 void
-WriteHeader_SV8 ( mpc_encoder_t*e,
+writeStreamInfo ( mpc_encoder_t*e,
                                   const unsigned int  MaxBand,
                   const unsigned int  MS_on,
                   const unsigned int  SamplesCount,
-                  const unsigned int  StreamVersion,
-                                  const unsigned int  PNS_on,
                   const unsigned int  SampleFreq,
                                   const unsigned int  ChannelCount)
@@ -93 +91 @@
         int i;
 
-    writeBits ( e, StreamVersion,  8 );    // StreamVersion
+    writeBits ( e, 0x08,  8 );    // StreamVersion
 
         for( i = 0; i < samplesCountLen; i++) // nb of samples
@@ -109 +107 @@
         writeBits ( e, ChannelCount - 1  ,  4 );    // Channels
         writeBits ( e, MaxBand - 1  ,  5 );    // Bandwidth
-        writeBits ( e, 0            ,  1 );    // former IS-Flag (not supported anymore)
         writeBits ( e, MS_on        ,  1 );    // MS-Coding Flag
-        writeBits ( e, PNS_on       ,  1 );    // PNS flag
         writeBits ( e, FRAMES_PER_BLOCK_PWR,  4 );    // frames per block (log2 unit)
+}
+
+// writes encoder signature
+void writeEncoderInfo ( mpc_encoder_t * e,
+                                                const int profile,
+                                                const int PNS_on,
+                                                const int version_major,
+                                                const int version_minor,
+                                                const int version_implement,
+                                                const int version_build )
+{
+        writeBits ( e, profile,  4 );
+        writeBits ( e, PNS_on,  1 );
+        writeBits ( e, 0,  3 ); // unused
+        writeBits ( e, version_major,  4 );
+        writeBits ( e, version_minor,  8 );
+        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
 }
 

mppenc/branches/r2d/libmpcenc/libmpcenc.h

@@ -25 +25 @@
 #ifndef NULL
 #define NULL 0
-#endif
-
-// FIXME : remove MPPENC_VERSION from here
-#ifndef MPPENC_VERSION
-# define MPPENC_VERSION   "1.15w-6"
 #endif