Changeset 195 for libmpc/branches/r2d/libmpcdec/synth_filter.c

Timestamp:

12/29/06 15:21:35 (17 years ago)

Author:

r2d

Message:

• moved libmpcdec includes in /mpc
• removed mppdec.h and mpp.h
• mpcenc defines cleanup

File:

• libmpc/branches/r2d/libmpcdec/synth_filter.c (modified) (6 diffs)

libmpc/branches/r2d/libmpcdec/synth_filter.c

@@ -36 +36 @@
 /// \todo document me
 #include <string.h>
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 #include "decoder.h"
 #include "math.h"
@@ -283 +283 @@
     A15 = MPC_SCALE_CONST_SHL((B14 - B15) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
 
-    // mehrfach verwendete Ausdrücke: A04+A06+A07, A09+A13+A15
+    // mehrfach verwendete Ausdrcke: A04+A06+A07, A09+A13+A15
     pV[ 5] = (pV[11] = (pV[13] = A07 + (pV[15] = A15)) + A11) + A05 + A13;
     pV[ 7] = (pV[ 9] = A03 + A11 + A15) + A13;
@@ -289 +289 @@
     pV[35] = -(pV[ 3] = A05 + A07 + A09 + A13 + A15) - A06 - A14;
     pV[37] = (tmp = -(A10 + A11 + A13 + A14 + A15)) - A05 - A06 - A07;
-    pV[39] = tmp - A02 - A03;                      // abhängig vom Befehl drüber
-    pV[41] = (tmp += A13 - A12) - A02 - A03;       // abhängig vom Befehl 2 drüber
-    pV[43] = tmp - A04 - A06 - A07;                // abhängig von Befehlen 1 und 3 drüber
+    pV[39] = tmp - A02 - A03;                      // abhï¿œgig vom Befehl drber
+    pV[41] = (tmp += A13 - A12) - A02 - A03;       // abhï¿œgig vom Befehl 2 drber
+    pV[43] = tmp - A04 - A06 - A07;                // abhï¿œgig von Befehlen 1 und 3 drber
     pV[47] = (tmp = -(A08 + A12 + A14 + A15)) - A00;
-    pV[45] = tmp - A04 - A06 - A07;                // abhängig vom Befehl drüber
+    pV[45] = tmp - A04 - A06 - A07;                // abhï¿œgig vom Befehl drber
 
     pV[32] = -pV[ 0];
@@ -329 +329 @@
 }
 
-static void 
+static void
 mpc_synthese_filter_float_internal(MPC_SAMPLE_FORMAT* p_out, MPC_SAMPLE_FORMAT* pV, const MPC_SAMPLE_FORMAT* pY)
 {
@@ -356 +356 @@
 
 void
-mpc_decoder_synthese_filter_float(mpc_decoder* p_dec, MPC_SAMPLE_FORMAT* p_out) 
+mpc_decoder_synthese_filter_float(mpc_decoder* p_dec, MPC_SAMPLE_FORMAT* p_out)
 {
     /********* left channel ********/
@@ -411 +411 @@
  */
 mpc_uint32_t
-mpc_random_int(mpc_decoder* p_dec) 
+mpc_random_int(mpc_decoder* p_dec)
 {
 #if 1