Changeset 71 for mppenc/branches/r2d/libmpcenc/tools.c

Timestamp:

10/07/06 02:49:28 (18 years ago)

Author:

r2d

Message:

• fixed a LOT of bugs
• fixed a bug that took me 2 days to find :)
• remember to ALWAYS use -Wall with a C compiler (C++ is great !!!)
• files can be played, but are not bit identical with the 1.15w encoder (the last digits of floats are not the same) - must be fixed.

File:

• mppenc/branches/r2d/libmpcenc/tools.c (modified) (9 diffs)

mppenc/branches/r2d/libmpcenc/tools.c

@@ -40 +40 @@
 #if defined HAVE_INCOMPLETE_READ  &&  FILEIO != 1
 
-size_t
-complete_read ( int fd, void* dest, size_t bytes )
-{
-    size_t  bytesread = 0;
-    size_t  ret;
+mpc_size_t
+complete_read ( int fd, void* dest, mpc_size_t bytes )
+{
+    mpc_size_t  bytesread = 0;
+    mpc_size_t  ret;
 
     while ( bytes > 0 ) {
@@ -52 +52 @@
         ret = read ( fd, dest, bytes );
 #endif
-        if ( ret == 0  ||  ret == (size_t)-1 )
+        if ( ret == 0  ||  ret == (mpc_size_t)-1 )
             break;
         dest       = (void*)(((char*)dest) + ret);
@@ -75 +75 @@
 
 static void
-Change_Endian32 ( mpc_uint32_t* dst, size_t words32bit )
+Change_Endian32 ( mpc_uint32_t* dst, mpc_size_t words32bit )
 {
 
@@ -107 +107 @@
  */
 
-size_t
-Read_LittleEndians ( FILE* fp, mpc_uint32_t* dst, size_t words32bit )
-{
-    size_t  wordsread;
+mpc_size_t
+Read_LittleEndians ( FILE* fp, mpc_uint32_t* dst, mpc_size_t words32bit )
+{
+    mpc_size_t  wordsread;
     wordsread = READ ( fp, dst, words32bit * sizeof(*dst) ) / sizeof(*dst);
 
@@ -195 +195 @@
 
 void
-Requantize_MidSideStereo ( Int Stop_Band, const Bool_t* used_MS )
-{
-    Int    Band;  // 0...Stop_Band
+Requantize_MidSideStereo ( mpc_int_t Stop_Band, const mpc_bool_t* used_MS )
+{
+    mpc_int_t    Band;  // 0...Stop_Band
     Uint   k;     // 0...35
     Float  ML;
@@ -412 +412 @@
 
 void
-Requantize_IntensityStereo ( Int Start_Band, Int Stop_Band )
-{
-    Int    Band;  // Start_Band...Stop_Band
+Requantize_IntensityStereo ( mpc_int_t Start_Band, mpc_int_t Stop_Band )
+{
+    mpc_int_t    Band;  // Start_Band...Stop_Band
     Uint   k;     // 0...35
     Float  ML;
@@ -479 +479 @@
 
 void
-Resort_HuffTable ( Huffman_t* const Table, const size_t elements, Int offset )
-{
-    size_t  i;
+Resort_HuffTable ( Huffman_t* const Table, const mpc_size_t elements, mpc_int_t offset )
+{
+    mpc_size_t  i;
 
     for ( i = 0; i < elements; i++ ) {
@@ -505 +505 @@
 
 void
-Make_HuffTable ( Huffman_t* dst, const HuffSrc_t* src, size_t len )
-{
-    size_t  i;
+Make_HuffTable ( Huffman_t* dst, const HuffSrc_t* src, mpc_size_t len )
+{
+    mpc_size_t  i;
 
     for ( i = 0; i < len; i++,src++,dst++ ) {
@@ -530 +530 @@
 
 void
-Make_LookupTable ( mpc_uint8_t* LUT, size_t LUT_len, const Huffman_t* const Table, const size_t elements )
-{
-    size_t    i;
-    size_t    idx  = elements;
+Make_LookupTable ( mpc_uint8_t* LUT, mpc_size_t LUT_len, const Huffman_t* const Table, const mpc_size_t elements )
+{
+    mpc_size_t    i;
+    mpc_size_t    idx  = elements;
     mpc_uint32_t  dval = (mpc_uint32_t)0x80000000L / LUT_len * 2;
     mpc_uint32_t  val  = dval - 1;