Merge branch 'master' into at3plus-dev

5 files changed, 10 insertions, 10 deletions

diff --git a/src/atrac/atrac1.cpp b/src/atrac/atrac1.cpp
index f7e6c61..e128609 100644
--- a/src/atrac/atrac1.cpp
+++ b/src/atrac/atrac1.cpp
@@ -26,8 +26,8 @@ constexpr uint32_t TAtrac1Data::SpecsPerBlock[MaxBfus];
 constexpr uint32_t TAtrac1Data::SpecsStartLong[MaxBfus];
 constexpr uint32_t TAtrac1Data::SpecsStartShort[MaxBfus];
 constexpr uint32_t TAtrac1Data::BfuAmountTab[8];
-double TAtrac1Data::ScaleTable[64] = {0};
-double TAtrac1Data::SineWindow[32] = {0};
+TFloat TAtrac1Data::ScaleTable[64] = {0};
+TFloat TAtrac1Data::SineWindow[32] = {0};
 
 } //namespace NAtrac1
 } //namespace NAtracDEnc
diff --git a/src/atrac/atrac1.h b/src/atrac/atrac1.h
index e0d8161..67c869f 100644
--- a/src/atrac/atrac1.h
+++ b/src/atrac/atrac1.h
@@ -78,8 +78,8 @@ protected:
 	static const uint32_t BitsPerIDWL = 4;
 	static const uint32_t BitsPerIDSF = 6;
 
-    static double ScaleTable[64];
-    static double SineWindow[32];
+    static TFloat ScaleTable[64];
+    static TFloat SineWindow[32];
     uint32_t BfuToBand(uint32_t i) {
         if (i < 20)
             return 0;
diff --git a/src/atrac/atrac3plus_pqf/atrac3plus_pqf.c b/src/atrac/atrac3plus_pqf/atrac3plus_pqf.c
index 0742469..00e893a 100644
--- a/src/atrac/atrac3plus_pqf/atrac3plus_pqf.c
+++ b/src/atrac/atrac3plus_pqf/atrac3plus_pqf.c
@@ -78,7 +78,7 @@ static void init(void)
     }
 }
 
-static void vectoring(const float* const x, float* y)
+static void vectoring(const float* const x, double* y)
 {
     for (int i = 0; i < 32; i++) {
         y[i] = 0;
@@ -88,7 +88,7 @@ static void vectoring(const float* const x, float* y)
     }
 }
 
-static void matrixing(atde_dct_ctx_t ctx, const float* y, float* samples )
+static void matrixing(atde_dct_ctx_t ctx, const double* y, float* samples )
 {
     float yy[SUBBANDS_NUM];
     float res[SUBBANDS_NUM];
@@ -129,7 +129,7 @@ void at3plus_pqf_free_a_ctx(at3plus_pqf_a_ctx_t ctx)
 
 void at3plus_pqf_do_analyse(at3plus_pqf_a_ctx_t ctx, const float* in, float* out)
 {
-    float y[SUBBANDS_NUM * 2];
+    double y[SUBBANDS_NUM * 2];
 
     float* const buf = ctx->buf;
 
diff --git a/src/atrac/atrac3plus_pqf/ut/ipqf_ut.cpp b/src/atrac/atrac3plus_pqf/ut/ipqf_ut.cpp
index c7eec07..4492cb9 100644
--- a/src/atrac/atrac3plus_pqf/ut/ipqf_ut.cpp
+++ b/src/atrac/atrac3plus_pqf/ut/ipqf_ut.cpp
@@ -233,7 +233,7 @@ TEST(pqf, Chirp_Short) {
 
     ff_atrac3p_ipqf(&sctx, &subbands[0], &tmp[0]);
 
-    const static float err = 1.0 / (float)(1<<22);
+    const static float err = 1.0 / (float)(1<<21);
 
     for (int i = 368; i < 2048; i++) {
         EXPECT_NEAR(tmp[i], x[i - 368], err);
@@ -260,7 +260,7 @@ TEST(pqf, Chirp_Long) {
     ff_atrac3p_ipqf(&sctx, &subbands[0], &tmp[0]);
     ff_atrac3p_ipqf(&sctx, &subbands[2048], &tmp[2048]);
 
-    const static float err = 4096.0 / (float)(1<<21);
+    const static float err = 1.0 / (float)(1<<21);
     for (int i = 368; i < 4096; i++) {
         EXPECT_NEAR(tmp[i], x[i-368], err);
     }
diff --git a/src/atrac/atrac_psy_common.h b/src/atrac/atrac_psy_common.h
index dc1e65e..1a83e74 100644
--- a/src/atrac/atrac_psy_common.h
+++ b/src/atrac/atrac_psy_common.h
@@ -21,6 +21,6 @@
 
 namespace NAtracDEnc {
 
-double AnalizeScaleFactorSpread(const std::vector<TScaledBlock>& scaledBlocks);
+TFloat AnalizeScaleFactorSpread(const std::vector<TScaledBlock>& scaledBlocks);
 
 } //namespace NAtracDEnc