auracaster/liblc3
3
0
Fork 0
mirror of https://github.com/google/liblc3.git synced 2026-07-14 11:30:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove use of deprecated int numpy attribute

Browse Source
This commit is contained in:
Antoine Soulier
2023-02-15 16:03:12 -08:00
parent afb786c0d8
commit 1669b25e09
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/sns.py
+3 -3
View File
@@ -345,7 +345,7 @@ class SnsSynthesis(Sns):
def deenum_mpvq(self, index, ls, npulses, n): def deenum_mpvq(self, index, ls, npulses, n):
y = np.zeros(n, dtype=np.int) y = np.zeros(n, dtype=np.intc)
pos = 0 pos = 0
for i in range(len(y)-1, -1, -1): for i in range(len(y)-1, -1, -1):
@@ -374,14 +374,14 @@ class SnsSynthesis(Sns):
## 3.7.4.2.1-2 SNS VQ Decoding ## 3.7.4.2.1-2 SNS VQ Decoding
y = np.empty(16, dtype=np.int) y = np.empty(16, dtype=np.intc)
if self.shape == 0: if self.shape == 0:
y[:10] = self.deenum_mpvq(self.idx_a, self.ls_a, 10, 10) y[:10] = self.deenum_mpvq(self.idx_a, self.ls_a, 10, 10)
y[10:] = self.deenum_mpvq(self.idx_b, self.ls_b, 1, 6) y[10:] = self.deenum_mpvq(self.idx_b, self.ls_b, 1, 6)
elif self.shape == 1: elif self.shape == 1:
y[:10] = self.deenum_mpvq(self.idx_a, self.ls_a, 10, 10) y[:10] = self.deenum_mpvq(self.idx_a, self.ls_a, 10, 10)
y[10:] = np.zeros(6, dtype=np.int) y[10:] = np.zeros(6, dtype=np.intc)
elif self.shape == 2: elif self.shape == 2:
y = self.deenum_mpvq(self.idx_a, self.ls_a, 8, 16) y = self.deenum_mpvq(self.idx_a, self.ls_a, 8, 16)
elif self.shape == 3: elif self.shape == 3:
test/spec.py
+3 -3
View File
@@ -444,7 +444,7 @@ class SpectrumSynthesis(SpectrumQuantization):
x = np.zeros(T.NE[self.dt][self.sr]) x = np.zeros(T.NE[self.dt][self.sr])
rate = 512 if nbytes > 20 * (1 + self.sr) else 0 rate = 512 if nbytes > 20 * (1 + self.sr) else 0
levs = np.zeros(len(x), dtype=np.int) levs = np.zeros(len(x), dtype=np.intc)
c = 0 c = 0
for n in range(0, self.lastnz, 2): for n in range(0, self.lastnz, 2):
@@ -540,7 +540,7 @@ class SpectrumSynthesis(SpectrumQuantization):
### Set residual and noise ### Set residual and noise
nf_seed = sum(abs(x.astype(np.int)) * range(len(x))) nf_seed = sum(abs(x.astype(np.intc)) * range(len(x)))
zero_frame = (self.lastnz <= 2 and x[0] == 0 and x[1] == 0 zero_frame = (self.lastnz <= 2 and x[0] == 0 and x[1] == 0
and self.g_idx <= 0 and f_nf >= 7) and self.g_idx <= 0 and f_nf >= 7)
@@ -766,7 +766,7 @@ def check_appendix_c(dt):
'nfilters' : C.NUM_TNS_FILTERS[dt][i], 'nfilters' : C.NUM_TNS_FILTERS[dt][i],
'lpc_weighting' : [ True, True ], 'lpc_weighting' : [ True, True ],
'rc_order' : [ C.RC_ORDER[dt][i][0], 0 ], 'rc_order' : [ C.RC_ORDER[dt][i][0], 0 ],
'rc' : [ C.RC_I_1[dt][i] - 8, np.zeros(8, dtype = np.int) ] 'rc' : [ C.RC_I_1[dt][i] - 8, np.zeros(8, dtype = np.intc) ]
} }
(x, xq, side) = lc3.spec_analyze(dt, sr, C.NBYTES[dt], (x, xq, side) = lc3.spec_analyze(dt, sr, C.NBYTES[dt],
test/tns.py
+4 -4
View File
@@ -187,8 +187,8 @@ class TnsAnalysis(Tns):
self.nfilters = len(Tns.SUB_LIM[self.dt][bw]) self.nfilters = len(Tns.SUB_LIM[self.dt][bw])
self.lpc_weighting = nbytes * 8 < 48 * T.DT_MS[self.dt] self.lpc_weighting = nbytes * 8 < 48 * T.DT_MS[self.dt]
self.rc_order = np.zeros(2, dtype=np.int) self.rc_order = np.zeros(2, dtype=np.intc)
self.rc = np.zeros((2, 8), dtype=np.int) self.rc = np.zeros((2, 8), dtype=np.intc)
for f in range(self.nfilters): for f in range(self.nfilters):
@@ -259,8 +259,8 @@ class TnsSynthesis(Tns):
self.nfilters = len(Tns.SUB_LIM[self.dt][bw]) self.nfilters = len(Tns.SUB_LIM[self.dt][bw])
self.lpc_weighting = nbytes * 8 < 48 * T.DT_MS[self.dt] self.lpc_weighting = nbytes * 8 < 48 * T.DT_MS[self.dt]
self.rc_order = np.zeros(2, dtype=np.int) self.rc_order = np.zeros(2, dtype=np.intc)
self.rc = 8 * np.ones((2, 8), dtype=np.int) self.rc = 8 * np.ones((2, 8), dtype=np.intc)
for f in range(self.nfilters): for f in range(self.nfilters):