Update FLAC to 1.3.1

src/libFLAC/fixed.c

 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ * Copyright (C) 2000-2009  Josh Coalson
+ * Copyright (C) 2011-2014  Xiph.Org Foundation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * - Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
  * - Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  *
  * - Neither the name of the Xiph.org Foundation nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
 #include <math.h>
 #include <string.h>
+#include "share/compat.h"
 #include "private/bitmath.h"
 #include "private/fixed.h"
+#include "private/macros.h"
 #include "FLAC/assert.h"
 
-#ifndef M_LN2
-/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */
-#define M_LN2 0.69314718055994530942
-#endif
-
-#ifdef min
-#undef min
-#endif
-#define min(x,y) ((x) < (y)? (x) : (y))
-
 #ifdef local_abs
 #undef local_abs
 #endif
 #define local_abs(x) ((unsigned)((x)<0? -(x) : (x)))
 
 #ifdef FLAC__INTEGER_ONLY_LIBRARY
 /* rbps stands for residual bits per sample
  *
  *             (ln(2) * err)
  * rbps = log  (-----------)
@@ skipping 173 matching lines @@
         unsigned i, order;
 
         for(i = 0; i < data_len; i++) {
                 error  = data[i]     ; total_error_0 += local_abs(error);                      save = error;
                 error -= last_error_0; total_error_1 += local_abs(error); last_error_0 = save; save = error;
                 error -= last_error_1; total_error_2 += local_abs(error); last_error_1 = save; save = error;
                 error -= last_error_2; total_error_3 += local_abs(error); last_error_2 = save; save = error;
                 error -= last_error_3; total_error_4 += local_abs(error); last_error_3 = save;
         }
 
-        if(total_error_0 < min(min(min(total_error_1, total_error_2), total_error_3), total_error_4))
+        if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4))
                 order = 0;
-        else if(total_error_1 < min(min(total_error_2, total_error_3), total_error_4))
+        else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4))
                 order = 1;
-        else if(total_error_2 < min(total_error_3, total_error_4))
+        else if(total_error_2 < flac_min(total_error_3, total_error_4))
                 order = 2;
         else if(total_error_3 < total_error_4)
                 order = 3;
         else
                 order = 4;
 
         /* Estimate the expected number of bits per residual signal sample. */
         /* 'total_error*' is linearly related to the variance of the residual */
         /* signal, so we use it directly to compute E(|x|) */
         FLAC__ASSERT(data_len > 0 || total_error_0 == 0);
@@ skipping 37 matching lines @@
         unsigned i, order;
 
         for(i = 0; i < data_len; i++) {
                 error  = data[i]     ; total_error_0 += local_abs(error);                      save = error;
                 error -= last_error_0; total_error_1 += local_abs(error); last_error_0 = save; save = error;
                 error -= last_error_1; total_error_2 += local_abs(error); last_error_1 = save; save = error;
                 error -= last_error_2; total_error_3 += local_abs(error); last_error_2 = save; save = error;
                 error -= last_error_3; total_error_4 += local_abs(error); last_error_3 = save;
         }
 
-        if(total_error_0 < min(min(min(total_error_1, total_error_2), total_error_3), total_error_4))
+        if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4))
                 order = 0;
-        else if(total_error_1 < min(min(total_error_2, total_error_3), total_error_4))
+        else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4))
                 order = 1;
-        else if(total_error_2 < min(total_error_3, total_error_4))
+        else if(total_error_2 < flac_min(total_error_3, total_error_4))
                 order = 2;
         else if(total_error_3 < total_error_4)
                 order = 3;
         else
                 order = 4;
 
         /* Estimate the expected number of bits per residual signal sample. */
         /* 'total_error*' is linearly related to the variance of the residual */
         /* signal, so we use it directly to compute E(|x|) */
         FLAC__ASSERT(data_len > 0 || total_error_0 == 0);
         FLAC__ASSERT(data_len > 0 || total_error_1 == 0);
         FLAC__ASSERT(data_len > 0 || total_error_2 == 0);
         FLAC__ASSERT(data_len > 0 || total_error_3 == 0);
         FLAC__ASSERT(data_len > 0 || total_error_4 == 0);
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
-#if defined _MSC_VER || defined __MINGW32__
-        /* with MSVC you have to spoon feed it the casting */
-        residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
-        residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
-        residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
-        residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
-        residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
-#else
         residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0);
         residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0);
         residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0);
         residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0);
         residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0);
-#endif
 #else
         residual_bits_per_sample[0] = (total_error_0 > 0) ? local__compute_rbps_wide_integerized(total_error_0, data_len) : 0;
         residual_bits_per_sample[1] = (total_error_1 > 0) ? local__compute_rbps_wide_integerized(total_error_1, data_len) : 0;
         residual_bits_per_sample[2] = (total_error_2 > 0) ? local__compute_rbps_wide_integerized(total_error_2, data_len) : 0;
         residual_bits_per_sample[3] = (total_error_3 > 0) ? local__compute_rbps_wide_integerized(total_error_3, data_len) : 0;
         residual_bits_per_sample[4] = (total_error_4 > 0) ? local__compute_rbps_wide_integerized(total_error_4, data_len) : 0;
 #endif
 
         return order;
 }
@@ skipping 75 matching lines @@
 #if 1 /* OPT: may be faster with some compilers on some systems */
                                 data[i] = residual[i] + ((data[i-1]+data[i-3])<<2) - ((data[i-2]<<2) + (data[i-2]<<1)) - data[i-4];
 #else
                                 data[i] = residual[i] + 4*data[i-1] - 6*data[i-2] + 4*data[i-3] - data[i-4];
 #endif
                         break;
                 default:
                         FLAC__ASSERT(0);
         }
 }