Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / libzmpeg3 / audio / synthesizers.C

diff --git a/cinelerra-5.0/libzmpeg3/audio/synthesizers.C b/cinelerra-5.0/libzmpeg3/audio/synthesizers.C
deleted file mode 100644 (file)
index d22d4c1..0000000
--- a/cinelerra-5.0/libzmpeg3/audio/synthesizers.C
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "../libzmpeg3.h"
-
-#define WRITE_SAMPLE(samples, sum) do { *(samples) = (sum); } while(0)
-
-int zaudio_decoder_layer_t::
-synth_stereo(float *bandPtr, int channel, float *out, int *pnt)
-{
-  float *samples = out + *pnt;
-  register float sum;
-  float *b0, (*buf)[0x110];
-  int j, bo1;
-
-  if( !channel ) {
-    --bo;
-    bo &= 0xf;
-    buf = synth_stereo_buffs[0];
-  }
-  else
-    buf = synth_stereo_buffs[1];
-
-  if( bo & 0x1 ) {
-    b0 = buf[0];
-    bo1 = bo;
-    dct64(buf[1] + ((bo + 1) & 0xf), buf[0] + bo, bandPtr);
-  }
-  else {
-    b0 = buf[1];
-    bo1 = bo + 1;
-    dct64(buf[0] + bo, buf[1] + bo + 1, bandPtr);
-  }
-
-//zmsgs("%f %f %f\n", buf[0][0], buf[1][0], bandPtr[0]);
-
-  float *window = decwin + 16 - bo1;
-  for( j=16; j > 0; --j, b0+=0x10, window+=0x20, ++samples ) {
-    sum  = window[0x0] * b0[0x0];
-    sum -= window[0x1] * b0[0x1];
-    sum += window[0x2] * b0[0x2];
-    sum -= window[0x3] * b0[0x3];
-    sum += window[0x4] * b0[0x4];
-    sum -= window[0x5] * b0[0x5];
-    sum += window[0x6] * b0[0x6];
-    sum -= window[0x7] * b0[0x7];
-    sum += window[0x8] * b0[0x8];
-    sum -= window[0x9] * b0[0x9];
-    sum += window[0xA] * b0[0xA];
-    sum -= window[0xB] * b0[0xB];
-    sum += window[0xC] * b0[0xC];
-    sum -= window[0xD] * b0[0xD];
-    sum += window[0xE] * b0[0xE];
-    sum -= window[0xF] * b0[0xF];
-    WRITE_SAMPLE(samples, sum);
-  }
-
-  sum  = window[0x0] * b0[0x0];
-  sum += window[0x2] * b0[0x2];
-  sum += window[0x4] * b0[0x4];
-  sum += window[0x6] * b0[0x6];
-  sum += window[0x8] * b0[0x8];
-  sum += window[0xA] * b0[0xA];
-  sum += window[0xC] * b0[0xC];
-  sum += window[0xE] * b0[0xE];
-  WRITE_SAMPLE(samples, sum);
-  b0 -= 0x10;
-  window -= 0x20;
-  ++samples;
-  window += bo1 << 1;
-
-  for( j=15; j > 0; --j, b0-=0x10, window-=0x20, ++samples ) {
-    sum = -window[-0x1] * b0[0x0];
-    sum -= window[-0x2] * b0[0x1];
-    sum -= window[-0x3] * b0[0x2];
-    sum -= window[-0x4] * b0[0x3];
-    sum -= window[-0x5] * b0[0x4];
-    sum -= window[-0x6] * b0[0x5];
-    sum -= window[-0x7] * b0[0x6];
-    sum -= window[-0x8] * b0[0x7];
-    sum -= window[-0x9] * b0[0x8];
-    sum -= window[-0xA] * b0[0x9];
-    sum -= window[-0xB] * b0[0xA];
-    sum -= window[-0xC] * b0[0xB];
-    sum -= window[-0xD] * b0[0xC];
-    sum -= window[-0xE] * b0[0xD];
-    sum -= window[-0xF] * b0[0xE];
-    sum -= window[-0x0] * b0[0xF];
-
-    WRITE_SAMPLE(samples, sum);
-  }
-  *pnt += 32;
-
-  return 0;
-}
-
-
-
-/* Call this after every seek to reset the buffers */
-int zaudio_decoder_layer_t::
-synths_reset()
-{
-  int i, j, k;
-  for( i=0; i < 2; ++i ) {
-    for( j=0; j < 2; ++j ) {
-      for( k=0; k < 0x110; ++k ) {
-        synth_stereo_buffs[i][j][k] = 0;
-      }
-    }
-  }
-  for( i=0; i < 64; ++i ) {
-    synth_mono_buff[i] = 0;
-    layer2_scfsi_buf[i] = 0;
-  }
-  for( i=0; i < 2; ++i ) {
-    for( j=0; j < 2; ++j ) {
-      for( k=0; k < (int)(SBLIMIT*SSLIMIT); ++k ) {
-        mp3_block[i][j][k] = 0;
-      }
-    }
-  }
-  mp3_blc[0] = 0;
-  mp3_blc[1] = 0;
-  return 0;
-}
-