add FLAC__metadata_simple_iterator_get_application_id()

[platform/upstream/flac.git] / src / libFLAC / fixed.c

diff --git a/src/libFLAC/fixed.c b/src/libFLAC/fixed.c
index c1d4a52..1a3aac0 100644 (file)
--- a/src/libFLAC/fixed.c
+++ b/src/libFLAC/fixed.c
@@ -1,5 +1,5 @@
 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005  Josh Coalson
+ * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <math.h>
+#include <string.h>
 #include "private/bitmath.h"
 #include "private/fixed.h"
 #include "FLAC/assert.h"
@@ -351,32 +356,36 @@ void FLAC__fixed_compute_residual(const FLAC__int32 data[], unsigned data_len, u
 
        switch(order) {
                case 0:
-                       for(i = 0; i < idata_len; i++) {
-                               residual[i] = data[i];
-                       }
+                       FLAC__ASSERT(sizeof(residual[0]) == sizeof(data[0]));
+                       memcpy(residual, data, sizeof(residual[0])*data_len);
                        break;
                case 1:
-                       for(i = 0; i < idata_len; i++) {
+                       for(i = 0; i < idata_len; i++)
                                residual[i] = data[i] - data[i-1];
-                       }
                        break;
                case 2:
-                       for(i = 0; i < idata_len; i++) {
-                               /* == data[i] - 2*data[i-1] + data[i-2] */
+                       for(i = 0; i < idata_len; i++)
+#if 1 /* OPT: may be faster with some compilers on some systems */
                                residual[i] = data[i] - (data[i-1] << 1) + data[i-2];
-                       }
+#else
+                               residual[i] = data[i] - 2*data[i-1] + data[i-2];
+#endif
                        break;
                case 3:
-                       for(i = 0; i < idata_len; i++) {
-                               /* == data[i] - 3*data[i-1] + 3*data[i-2] - data[i-3] */
+                       for(i = 0; i < idata_len; i++)
+#if 1 /* OPT: may be faster with some compilers on some systems */
                                residual[i] = data[i] - (((data[i-1]-data[i-2])<<1) + (data[i-1]-data[i-2])) - data[i-3];
-                       }
+#else
+                               residual[i] = data[i] - 3*data[i-1] + 3*data[i-2] - data[i-3];
+#endif
                        break;
                case 4:
-                       for(i = 0; i < idata_len; i++) {
-                               /* == data[i] - 4*data[i-1] + 6*data[i-2] - 4*data[i-3] + data[i-4] */
+                       for(i = 0; i < idata_len; i++)
+#if 1 /* OPT: may be faster with some compilers on some systems */
                                residual[i] = data[i] - ((data[i-1]+data[i-3])<<2) + ((data[i-2]<<2) + (data[i-2]<<1)) + data[i-4];
-                       }
+#else
+                               residual[i] = data[i] - 4*data[i-1] + 6*data[i-2] - 4*data[i-3] + data[i-4];
+#endif
                        break;
                default:
                        FLAC__ASSERT(0);
@@ -389,32 +398,36 @@ void FLAC__fixed_restore_signal(const FLAC__int32 residual[], unsigned data_len,
 
        switch(order) {
                case 0:
-                       for(i = 0; i < idata_len; i++) {
-                               data[i] = residual[i];
-                       }
+                       FLAC__ASSERT(sizeof(residual[0]) == sizeof(data[0]));
+                       memcpy(data, residual, sizeof(residual[0])*data_len);
                        break;
                case 1:
-                       for(i = 0; i < idata_len; i++) {
+                       for(i = 0; i < idata_len; i++)
                                data[i] = residual[i] + data[i-1];
-                       }
                        break;
                case 2:
-                       for(i = 0; i < idata_len; i++) {
-                               /* == residual[i] + 2*data[i-1] - data[i-2] */
+                       for(i = 0; i < idata_len; i++)
+#if 1 /* OPT: may be faster with some compilers on some systems */
                                data[i] = residual[i] + (data[i-1]<<1) - data[i-2];
-                       }
+#else
+                               data[i] = residual[i] + 2*data[i-1] - data[i-2];
+#endif
                        break;
                case 3:
-                       for(i = 0; i < idata_len; i++) {
-                               /* residual[i] + 3*data[i-1] - 3*data[i-2]) + data[i-3] */
+                       for(i = 0; i < idata_len; i++)
+#if 1 /* OPT: may be faster with some compilers on some systems */
                                data[i] = residual[i] + (((data[i-1]-data[i-2])<<1) + (data[i-1]-data[i-2])) + data[i-3];
-                       }
+#else
+                               data[i] = residual[i] + 3*data[i-1] - 3*data[i-2] + data[i-3];
+#endif
                        break;
                case 4:
-                       for(i = 0; i < idata_len; i++) {
-                               /* == residual[i] + 4*data[i-1] - 6*data[i-2] + 4*data[i-3] - data[i-4] */
+                       for(i = 0; i < idata_len; i++)
+#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);