eden-emu/opus
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix DRED PVQ for case when K=0 on a split

Browse source
This commit is contained in:
Jean-Marc Valin 2023-05-09 02:45:19 -04:00
parent d7e1bd507f
commit 7d4aeb756f
No known key found for this signature in database
GPG key ID: 531A52533318F00A
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
silk/dred_coding.c
View file

@ -36,6 +36,7 @@
#include "celt/vq.h"
#include "celt/cwrs.h"
#include "celt/laplace.h"
#include "os_support.h"
#define LATENT_DIM 80
#define PVQ_DIM 24
@ -46,7 +47,10 @@ static void encode_pvq(const int *iy, int N, int K, ec_enc *enc) {
celt_assert(N==24 || N==12 || N==6);
fits = (N==24 && K<=9) || (N==12 && K<=16) || (N==6);
/*printf("encode(%d,%d), fits=%d\n", N, K, fits);*/
if (fits) encode_pulses(iy, N, K, enc);
if (fits) {
if (K > 0)
encode_pulses(iy, N, K, enc);
}
else {
int N2 = N/2;
int K0=0;
@ -90,7 +94,12 @@ static void decode_pvq(int *iy, int N, int K, ec_dec *dec) {
celt_assert(N==24 || N==12 || N==6);
fits = (N==24 && K<=9) || (N==12 && K<=16) || (N==6);
/*printf("encode(%d,%d), fits=%d\n", N, K, fits);*/
if (fits) decode_pulses(iy, N, K, dec);
if (fits) {
if (K > 0)
decode_pulses(iy, N, K, dec);
else
OPUS_CLEAR(iy, N);
}
else {
int N2 = N/2;
int K0;