From d1e9270ca16b710a2566ce97ff32558560a0e939 Mon Sep 17 00:00:00 2001
From: Antoine SOULIER <asoulier@google.com>
Date: Fri, 8 Jul 2022 21:33:58 +0200
Subject: [PATCH] test: fix run of python encoder

---
 test/bwdet.py   |  4 ++--
 test/decoder.py |  2 +-
 test/encoder.py | 17 +++++++----------
 test/tns.py     |  2 +-
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/test/bwdet.py b/test/bwdet.py
index 2f55c87..bb7dd83 100644
--- a/test/bwdet.py
+++ b/test/bwdet.py
@@ -81,11 +81,11 @@ class BandwidthDetector:
         return 0 if self.sr == 0 else \
                1 + np.log2(self.sr).astype(int)
 
-    def store_bw(self, b):
+    def store(self, b):
 
         b.write_uint(self.bw, self.get_nbits())
 
-    def get_bw(self, b):
+    def get(self, b):
 
         return b.read_uint(self.get_nbits())
 
diff --git a/test/decoder.py b/test/decoder.py
index 93ed918..4bacc23 100755
--- a/test/decoder.py
+++ b/test/decoder.py
@@ -54,7 +54,7 @@ class Decoder:
 
         b = bitstream.BitstreamReader(data)
 
-        bw = self.bwdet.get_bw(b)
+        bw = self.bwdet.get(b)
         if bw > self.sr:
             raise ValueError('Invalid bandwidth indication')
 
diff --git a/test/encoder.py b/test/encoder.py
index 0382b96..307d183 100755
--- a/test/encoder.py
+++ b/test/encoder.py
@@ -42,14 +42,14 @@ class Encoder:
         self.ne = T.NE[dt][sr]
 
         self.attdet = attdet.AttackDetector(dt, sr)
-        self.ltpf = ltpf.Ltpf(dt, sr)
+        self.ltpf = ltpf.LtpfAnalysis(dt, sr)
 
-        self.mdct = mdct.Mdct(dt, sr)
-        self.energy = e_energy.EnergyBand(dt, sr)
+        self.mdct = mdct.MdctForward(dt, sr)
+        self.energy = energy.EnergyBand(dt, sr)
         self.bwdet = bwdet.BandwidthDetector(dt, sr)
         self.sns = sns.SnsAnalysis(dt, sr)
         self.tns = tns.TnsAnalysis(dt)
-        self.spec = spec.SpectrumEncoder(dt, sr)
+        self.spec = spec.SpectrumAnalysis(dt, sr)
 
     def analyse(self, x, nbytes):
 
@@ -57,7 +57,7 @@ class Encoder:
 
         pitch_present = self.ltpf.run(x)
 
-        x = self.mdct.forward(x)[:self.ne]
+        x = self.mdct.run(x)[:self.ne]
 
         (e, nn_flag) = self.energy.compute(x)
         if nn_flag:
@@ -69,7 +69,7 @@ class Encoder:
 
         x = self.tns.run(x, bw, nn_flag, nbytes)
 
-        (xq, lastnz, x) = self.spec.quantize(bw, nbytes,
+        (xq, lastnz, x) = self.spec.run(bw, nbytes,
             self.bwdet.get_nbits(), self.ltpf.get_nbits(),
             self.sns.get_nbits(), self.tns.get_nbits(), x)
 
@@ -90,7 +90,7 @@ class Encoder:
         self.sns.store(b)
 
         if pitch_present:
-            self.ltpf.store_data(b)
+            self.ltpf.store(b)
 
         self.spec.encode(b)
 
@@ -116,9 +116,6 @@ def check_appendix_c(dt):
 
         data = lc3.encode(enc_c, C.X_PCM[dt][i], C.NBYTES[dt])
         ok = ok and data == C.BYTES_AC[dt][i]
-        if not ok:
-            dump(data)
-            dump(C.BYTES_AC[dt][i])
 
     return ok
 
diff --git a/test/tns.py b/test/tns.py
index 188093f..fde7d54 100644
--- a/test/tns.py
+++ b/test/tns.py
@@ -221,7 +221,7 @@ class TnsAnalysis(Tns):
     def store(self, b):
 
         for f in range(self.nfilters):
-            lpc_weighting = self.lpc_weighting[f]
+            lpc_weighting = self.lpc_weighting
             rc_order = self.rc_order[f]
             rc = self.rc[f]