auracaster/liblc3
3
0
Fork 0
mirror of https://github.com/google/liblc3.git synced 2026-05-24 12:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix run of python encoder

Browse Source
This commit is contained in:
Antoine SOULIER
2022-07-08 21:33:58 +02:00
parent 7e7ba31bbf
commit d1e9270ca1
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/bwdet.py
View File

@@ -81,11 +81,11 @@ class BandwidthDetector:
return 0 if self.sr == 0 else \ return 0 if self.sr == 0 else \
1 + np.log2(self.sr).astype(int) 1 + np.log2(self.sr).astype(int)
def store_bw(self, b): def store(self, b):
b.write_uint(self.bw, self.get_nbits()) b.write_uint(self.bw, self.get_nbits())
def get_bw(self, b): def get(self, b):
return b.read_uint(self.get_nbits()) return b.read_uint(self.get_nbits())

2
test/decoder.py
View File

@@ -54,7 +54,7 @@ class Decoder:
b = bitstream.BitstreamReader(data) b = bitstream.BitstreamReader(data)
bw = self.bwdet.get_bw(b) bw = self.bwdet.get(b)
if bw > self.sr: if bw > self.sr:
raise ValueError('Invalid bandwidth indication') raise ValueError('Invalid bandwidth indication')

17
test/encoder.py
View File

@@ -42,14 +42,14 @@ class Encoder:
self.ne = T.NE[dt][sr] self.ne = T.NE[dt][sr]
self.attdet = attdet.AttackDetector(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.mdct = mdct.MdctForward(dt, sr)
self.energy = e_energy.EnergyBand(dt, sr) self.energy = energy.EnergyBand(dt, sr)
self.bwdet = bwdet.BandwidthDetector(dt, sr) self.bwdet = bwdet.BandwidthDetector(dt, sr)
self.sns = sns.SnsAnalysis(dt, sr) self.sns = sns.SnsAnalysis(dt, sr)
self.tns = tns.TnsAnalysis(dt) self.tns = tns.TnsAnalysis(dt)
self.spec = spec.SpectrumEncoder(dt, sr) self.spec = spec.SpectrumAnalysis(dt, sr)
def analyse(self, x, nbytes): def analyse(self, x, nbytes):
@@ -57,7 +57,7 @@ class Encoder:
pitch_present = self.ltpf.run(x) 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) (e, nn_flag) = self.energy.compute(x)
if nn_flag: if nn_flag:
@@ -69,7 +69,7 @@ class Encoder:
x = self.tns.run(x, bw, nn_flag, nbytes) 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.bwdet.get_nbits(), self.ltpf.get_nbits(),
self.sns.get_nbits(), self.tns.get_nbits(), x) self.sns.get_nbits(), self.tns.get_nbits(), x)
@@ -90,7 +90,7 @@ class Encoder:
self.sns.store(b) self.sns.store(b)
if pitch_present: if pitch_present:
self.ltpf.store_data(b) self.ltpf.store(b)
self.spec.encode(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]) data = lc3.encode(enc_c, C.X_PCM[dt][i], C.NBYTES[dt])
ok = ok and data == C.BYTES_AC[dt][i] ok = ok and data == C.BYTES_AC[dt][i]
if not ok:
dump(data)
dump(C.BYTES_AC[dt][i])
return ok return ok

2
test/tns.py
View File

@@ -221,7 +221,7 @@ class TnsAnalysis(Tns):
def store(self, b): def store(self, b):
for f in range(self.nfilters): for f in range(self.nfilters):
lpc_weighting = self.lpc_weighting[f] lpc_weighting = self.lpc_weighting
rc_order = self.rc_order[f] rc_order = self.rc_order[f]
rc = self.rc[f] rc = self.rc[f]