diff options
Diffstat (limited to 'src/sns.c')
| -rw-r--r-- | src/sns.c | 287 |
1 files changed, 168 insertions, 119 deletions
@@ -146,121 +146,157 @@ LC3_HOT static void dct16_inverse(const float *x, float *y) /** * Scale factors * dt, sr Duration and samplerate of the frame + * nbytes Size in bytes of the frame * eb Energy estimation per bands * att 1: Attack detected 0: Otherwise * scf Output 16 scale factors */ LC3_HOT static void compute_scale_factors( - enum lc3_dt dt, enum lc3_srate sr, + enum lc3_dt dt, enum lc3_srate sr, int nbytes, const float *eb, bool att, float *scf) { /* Pre-emphasis gain table : * Ge[b] = 10 ^ (b * g_tilt) / 630 , b = [0..63] */ - static const float ge_table[LC3_NUM_SRATE][LC3_NUM_BANDS] = { - - [LC3_SRATE_8K] = { /* g_tilt = 14 */ - 1.00000000e+00, 1.05250029e+00, 1.10775685e+00, 1.16591440e+00, - 1.22712524e+00, 1.29154967e+00, 1.35935639e+00, 1.43072299e+00, - 1.50583635e+00, 1.58489319e+00, 1.66810054e+00, 1.75567629e+00, - 1.84784980e+00, 1.94486244e+00, 2.04696827e+00, 2.15443469e+00, - 2.26754313e+00, 2.38658979e+00, 2.51188643e+00, 2.64376119e+00, - 2.78255940e+00, 2.92864456e+00, 3.08239924e+00, 3.24422608e+00, - 3.41454887e+00, 3.59381366e+00, 3.78248991e+00, 3.98107171e+00, - 4.19007911e+00, 4.41005945e+00, 4.64158883e+00, 4.88527357e+00, - 5.14175183e+00, 5.41169527e+00, 5.69581081e+00, 5.99484250e+00, - 6.30957344e+00, 6.64082785e+00, 6.98947321e+00, 7.35642254e+00, - 7.74263683e+00, 8.14912747e+00, 8.57695899e+00, 9.02725178e+00, - 9.50118507e+00, 1.00000000e+01, 1.05250029e+01, 1.10775685e+01, - 1.16591440e+01, 1.22712524e+01, 1.29154967e+01, 1.35935639e+01, - 1.43072299e+01, 1.50583635e+01, 1.58489319e+01, 1.66810054e+01, - 1.75567629e+01, 1.84784980e+01, 1.94486244e+01, 2.04696827e+01, - 2.15443469e+01, 2.26754313e+01, 2.38658979e+01, 2.51188643e+01 }, - - [LC3_SRATE_16K] = { /* g_tilt = 18 */ - 1.00000000e+00, 1.06800043e+00, 1.14062492e+00, 1.21818791e+00, - 1.30102522e+00, 1.38949549e+00, 1.48398179e+00, 1.58489319e+00, - 1.69266662e+00, 1.80776868e+00, 1.93069773e+00, 2.06198601e+00, - 2.20220195e+00, 2.35195264e+00, 2.51188643e+00, 2.68269580e+00, - 2.86512027e+00, 3.05994969e+00, 3.26802759e+00, 3.49025488e+00, - 3.72759372e+00, 3.98107171e+00, 4.25178630e+00, 4.54090961e+00, - 4.84969343e+00, 5.17947468e+00, 5.53168120e+00, 5.90783791e+00, - 6.30957344e+00, 6.73862717e+00, 7.19685673e+00, 7.68624610e+00, - 8.20891416e+00, 8.76712387e+00, 9.36329209e+00, 1.00000000e+01, - 1.06800043e+01, 1.14062492e+01, 1.21818791e+01, 1.30102522e+01, - 1.38949549e+01, 1.48398179e+01, 1.58489319e+01, 1.69266662e+01, - 1.80776868e+01, 1.93069773e+01, 2.06198601e+01, 2.20220195e+01, - 2.35195264e+01, 2.51188643e+01, 2.68269580e+01, 2.86512027e+01, - 3.05994969e+01, 3.26802759e+01, 3.49025488e+01, 3.72759372e+01, - 3.98107171e+01, 4.25178630e+01, 4.54090961e+01, 4.84969343e+01, - 5.17947468e+01, 5.53168120e+01, 5.90783791e+01, 6.30957344e+01 }, - - [LC3_SRATE_24K] = { /* g_tilt = 22 */ - 1.00000000e+00, 1.08372885e+00, 1.17446822e+00, 1.27280509e+00, - 1.37937560e+00, 1.49486913e+00, 1.62003281e+00, 1.75567629e+00, - 1.90267705e+00, 2.06198601e+00, 2.23463373e+00, 2.42173704e+00, - 2.62450630e+00, 2.84425319e+00, 3.08239924e+00, 3.34048498e+00, - 3.62017995e+00, 3.92329345e+00, 4.25178630e+00, 4.60778348e+00, - 4.99358789e+00, 5.41169527e+00, 5.86481029e+00, 6.35586411e+00, - 6.88803330e+00, 7.46476041e+00, 8.08977621e+00, 8.76712387e+00, - 9.50118507e+00, 1.02967084e+01, 1.11588399e+01, 1.20931568e+01, - 1.31057029e+01, 1.42030283e+01, 1.53922315e+01, 1.66810054e+01, - 1.80776868e+01, 1.95913107e+01, 2.12316686e+01, 2.30093718e+01, - 2.49359200e+01, 2.70237760e+01, 2.92864456e+01, 3.17385661e+01, - 3.43959997e+01, 3.72759372e+01, 4.03970086e+01, 4.37794036e+01, - 4.74450028e+01, 5.14175183e+01, 5.57226480e+01, 6.03882412e+01, - 6.54444792e+01, 7.09240702e+01, 7.68624610e+01, 8.32980665e+01, - 9.02725178e+01, 9.78309319e+01, 1.06022203e+02, 1.14899320e+02, - 1.24519708e+02, 1.34945600e+02, 1.46244440e+02, 1.58489319e+02 }, - - [LC3_SRATE_32K] = { /* g_tilt = 26 */ - 1.00000000e+00, 1.09968890e+00, 1.20931568e+00, 1.32987103e+00, - 1.46244440e+00, 1.60823388e+00, 1.76855694e+00, 1.94486244e+00, - 2.13874364e+00, 2.35195264e+00, 2.58641621e+00, 2.84425319e+00, - 3.12779366e+00, 3.43959997e+00, 3.78248991e+00, 4.15956216e+00, - 4.57422434e+00, 5.03022373e+00, 5.53168120e+00, 6.08312841e+00, - 6.68954879e+00, 7.35642254e+00, 8.08977621e+00, 8.89623710e+00, - 9.78309319e+00, 1.07583590e+01, 1.18308480e+01, 1.30102522e+01, - 1.43072299e+01, 1.57335019e+01, 1.73019574e+01, 1.90267705e+01, - 2.09235283e+01, 2.30093718e+01, 2.53031508e+01, 2.78255940e+01, - 3.05994969e+01, 3.36499270e+01, 3.70044512e+01, 4.06933843e+01, - 4.47500630e+01, 4.92111475e+01, 5.41169527e+01, 5.95118121e+01, - 6.54444792e+01, 7.19685673e+01, 7.91430346e+01, 8.70327166e+01, - 9.57089124e+01, 1.05250029e+02, 1.15742288e+02, 1.27280509e+02, - 1.39968963e+02, 1.53922315e+02, 1.69266662e+02, 1.86140669e+02, - 2.04696827e+02, 2.25102829e+02, 2.47543082e+02, 2.72220379e+02, - 2.99357729e+02, 3.29200372e+02, 3.62017995e+02, 3.98107171e+02 }, - - [LC3_SRATE_48K] = { /* g_tilt = 30 */ - 1.00000000e+00, 1.11588399e+00, 1.24519708e+00, 1.38949549e+00, - 1.55051578e+00, 1.73019574e+00, 1.93069773e+00, 2.15443469e+00, - 2.40409918e+00, 2.68269580e+00, 2.99357729e+00, 3.34048498e+00, - 3.72759372e+00, 4.15956216e+00, 4.64158883e+00, 5.17947468e+00, - 5.77969288e+00, 6.44946677e+00, 7.19685673e+00, 8.03085722e+00, - 8.96150502e+00, 1.00000000e+01, 1.11588399e+01, 1.24519708e+01, - 1.38949549e+01, 1.55051578e+01, 1.73019574e+01, 1.93069773e+01, - 2.15443469e+01, 2.40409918e+01, 2.68269580e+01, 2.99357729e+01, - 3.34048498e+01, 3.72759372e+01, 4.15956216e+01, 4.64158883e+01, - 5.17947468e+01, 5.77969288e+01, 6.44946677e+01, 7.19685673e+01, - 8.03085722e+01, 8.96150502e+01, 1.00000000e+02, 1.11588399e+02, - 1.24519708e+02, 1.38949549e+02, 1.55051578e+02, 1.73019574e+02, - 1.93069773e+02, 2.15443469e+02, 2.40409918e+02, 2.68269580e+02, - 2.99357729e+02, 3.34048498e+02, 3.72759372e+02, 4.15956216e+02, - 4.64158883e+02, 5.17947468e+02, 5.77969288e+02, 6.44946677e+02, - 7.19685673e+02, 8.03085722e+02, 8.96150502e+02, 1.00000000e+03 }, + static const float ge_14[LC3_MAX_BANDS] = { /* g_tilt = 14 */ + 1.00000000e+00, 1.05250029e+00, 1.10775685e+00, 1.16591440e+00, + 1.22712524e+00, 1.29154967e+00, 1.35935639e+00, 1.43072299e+00, + 1.50583635e+00, 1.58489319e+00, 1.66810054e+00, 1.75567629e+00, + 1.84784980e+00, 1.94486244e+00, 2.04696827e+00, 2.15443469e+00, + 2.26754313e+00, 2.38658979e+00, 2.51188643e+00, 2.64376119e+00, + 2.78255940e+00, 2.92864456e+00, 3.08239924e+00, 3.24422608e+00, + 3.41454887e+00, 3.59381366e+00, 3.78248991e+00, 3.98107171e+00, + 4.19007911e+00, 4.41005945e+00, 4.64158883e+00, 4.88527357e+00, + 5.14175183e+00, 5.41169527e+00, 5.69581081e+00, 5.99484250e+00, + 6.30957344e+00, 6.64082785e+00, 6.98947321e+00, 7.35642254e+00, + 7.74263683e+00, 8.14912747e+00, 8.57695899e+00, 9.02725178e+00, + 9.50118507e+00, 1.00000000e+01, 1.05250029e+01, 1.10775685e+01, + 1.16591440e+01, 1.22712524e+01, 1.29154967e+01, 1.35935639e+01, + 1.43072299e+01, 1.50583635e+01, 1.58489319e+01, 1.66810054e+01, + 1.75567629e+01, 1.84784980e+01, 1.94486244e+01, 2.04696827e+01, + 2.15443469e+01, 2.26754313e+01, 2.38658979e+01, 2.51188643e+01 }; + + static const float ge_18[LC3_MAX_BANDS] = { /* g_tilt = 18 */ + 1.00000000e+00, 1.06800043e+00, 1.14062492e+00, 1.21818791e+00, + 1.30102522e+00, 1.38949549e+00, 1.48398179e+00, 1.58489319e+00, + 1.69266662e+00, 1.80776868e+00, 1.93069773e+00, 2.06198601e+00, + 2.20220195e+00, 2.35195264e+00, 2.51188643e+00, 2.68269580e+00, + 2.86512027e+00, 3.05994969e+00, 3.26802759e+00, 3.49025488e+00, + 3.72759372e+00, 3.98107171e+00, 4.25178630e+00, 4.54090961e+00, + 4.84969343e+00, 5.17947468e+00, 5.53168120e+00, 5.90783791e+00, + 6.30957344e+00, 6.73862717e+00, 7.19685673e+00, 7.68624610e+00, + 8.20891416e+00, 8.76712387e+00, 9.36329209e+00, 1.00000000e+01, + 1.06800043e+01, 1.14062492e+01, 1.21818791e+01, 1.30102522e+01, + 1.38949549e+01, 1.48398179e+01, 1.58489319e+01, 1.69266662e+01, + 1.80776868e+01, 1.93069773e+01, 2.06198601e+01, 2.20220195e+01, + 2.35195264e+01, 2.51188643e+01, 2.68269580e+01, 2.86512027e+01, + 3.05994969e+01, 3.26802759e+01, 3.49025488e+01, 3.72759372e+01, + 3.98107171e+01, 4.25178630e+01, 4.54090961e+01, 4.84969343e+01, + 5.17947468e+01, 5.53168120e+01, 5.90783791e+01, 6.30957344e+01 }; + + static const float ge_22[LC3_MAX_BANDS] = { /* g_tilt = 22 */ + 1.00000000e+00, 1.08372885e+00, 1.17446822e+00, 1.27280509e+00, + 1.37937560e+00, 1.49486913e+00, 1.62003281e+00, 1.75567629e+00, + 1.90267705e+00, 2.06198601e+00, 2.23463373e+00, 2.42173704e+00, + 2.62450630e+00, 2.84425319e+00, 3.08239924e+00, 3.34048498e+00, + 3.62017995e+00, 3.92329345e+00, 4.25178630e+00, 4.60778348e+00, + 4.99358789e+00, 5.41169527e+00, 5.86481029e+00, 6.35586411e+00, + 6.88803330e+00, 7.46476041e+00, 8.08977621e+00, 8.76712387e+00, + 9.50118507e+00, 1.02967084e+01, 1.11588399e+01, 1.20931568e+01, + 1.31057029e+01, 1.42030283e+01, 1.53922315e+01, 1.66810054e+01, + 1.80776868e+01, 1.95913107e+01, 2.12316686e+01, 2.30093718e+01, + 2.49359200e+01, 2.70237760e+01, 2.92864456e+01, 3.17385661e+01, + 3.43959997e+01, 3.72759372e+01, 4.03970086e+01, 4.37794036e+01, + 4.74450028e+01, 5.14175183e+01, 5.57226480e+01, 6.03882412e+01, + 6.54444792e+01, 7.09240702e+01, 7.68624610e+01, 8.32980665e+01, + 9.02725178e+01, 9.78309319e+01, 1.06022203e+02, 1.14899320e+02, + 1.24519708e+02, 1.34945600e+02, 1.46244440e+02, 1.58489319e+02 }; + + static const float ge_26[LC3_MAX_BANDS] = { /* g_tilt = 26 */ + 1.00000000e+00, 1.09968890e+00, 1.20931568e+00, 1.32987103e+00, + 1.46244440e+00, 1.60823388e+00, 1.76855694e+00, 1.94486244e+00, + 2.13874364e+00, 2.35195264e+00, 2.58641621e+00, 2.84425319e+00, + 3.12779366e+00, 3.43959997e+00, 3.78248991e+00, 4.15956216e+00, + 4.57422434e+00, 5.03022373e+00, 5.53168120e+00, 6.08312841e+00, + 6.68954879e+00, 7.35642254e+00, 8.08977621e+00, 8.89623710e+00, + 9.78309319e+00, 1.07583590e+01, 1.18308480e+01, 1.30102522e+01, + 1.43072299e+01, 1.57335019e+01, 1.73019574e+01, 1.90267705e+01, + 2.09235283e+01, 2.30093718e+01, 2.53031508e+01, 2.78255940e+01, + 3.05994969e+01, 3.36499270e+01, 3.70044512e+01, 4.06933843e+01, + 4.47500630e+01, 4.92111475e+01, 5.41169527e+01, 5.95118121e+01, + 6.54444792e+01, 7.19685673e+01, 7.91430346e+01, 8.70327166e+01, + 9.57089124e+01, 1.05250029e+02, 1.15742288e+02, 1.27280509e+02, + 1.39968963e+02, 1.53922315e+02, 1.69266662e+02, 1.86140669e+02, + 2.04696827e+02, 2.25102829e+02, 2.47543082e+02, 2.72220379e+02, + 2.99357729e+02, 3.29200372e+02, 3.62017995e+02, 3.98107171e+02 }; + + static const float ge_30[LC3_MAX_BANDS] = { /* g_tilt = 30 */ + 1.00000000e+00, 1.11588399e+00, 1.24519708e+00, 1.38949549e+00, + 1.55051578e+00, 1.73019574e+00, 1.93069773e+00, 2.15443469e+00, + 2.40409918e+00, 2.68269580e+00, 2.99357729e+00, 3.34048498e+00, + 3.72759372e+00, 4.15956216e+00, 4.64158883e+00, 5.17947468e+00, + 5.77969288e+00, 6.44946677e+00, 7.19685673e+00, 8.03085722e+00, + 8.96150502e+00, 1.00000000e+01, 1.11588399e+01, 1.24519708e+01, + 1.38949549e+01, 1.55051578e+01, 1.73019574e+01, 1.93069773e+01, + 2.15443469e+01, 2.40409918e+01, 2.68269580e+01, 2.99357729e+01, + 3.34048498e+01, 3.72759372e+01, 4.15956216e+01, 4.64158883e+01, + 5.17947468e+01, 5.77969288e+01, 6.44946677e+01, 7.19685673e+01, + 8.03085722e+01, 8.96150502e+01, 1.00000000e+02, 1.11588399e+02, + 1.24519708e+02, 1.38949549e+02, 1.55051578e+02, 1.73019574e+02, + 1.93069773e+02, 2.15443469e+02, 2.40409918e+02, 2.68269580e+02, + 2.99357729e+02, 3.34048498e+02, 3.72759372e+02, 4.15956216e+02, + 4.64158883e+02, 5.17947468e+02, 5.77969288e+02, 6.44946677e+02, + 7.19685673e+02, 8.03085722e+02, 8.96150502e+02, 1.00000000e+03 }; + +#if LC3_PLUS_HR + + static const float ge_34[LC3_MAX_BANDS] = { /* g_tilt = 34 */ + 1.00000000e+00, 1.13231759e+00, 1.28214312e+00, 1.45179321e+00, + 1.64389099e+00, 1.86140669e+00, 2.10770353e+00, 2.38658979e+00, + 2.70237760e+00, 3.05994969e+00, 3.46483486e+00, 3.92329345e+00, + 4.44241419e+00, 5.03022373e+00, 5.69581081e+00, 6.44946677e+00, + 7.30284467e+00, 8.26913948e+00, 9.36329209e+00, 1.06022203e+01, + 1.20050806e+01, 1.35935639e+01, 1.53922315e+01, 1.74288945e+01, + 1.97350438e+01, 2.23463373e+01, 2.53031508e+01, 2.86512027e+01, + 3.24422608e+01, 3.67349426e+01, 4.15956216e+01, 4.70994540e+01, + 5.33315403e+01, 6.03882412e+01, 6.83786677e+01, 7.74263683e+01, + 8.76712387e+01, 9.92716858e+01, 1.12407076e+02, 1.27280509e+02, + 1.44121960e+02, 1.63191830e+02, 1.84784980e+02, 2.09235283e+02, + 2.36920791e+02, 2.68269580e+02, 3.03766364e+02, 3.43959997e+02, + 3.89471955e+02, 4.41005945e+02, 4.99358789e+02, 5.65432741e+02, + 6.40249439e+02, 7.24965701e+02, 8.20891416e+02, 9.29509790e+02, + 1.05250029e+03, 1.19176459e+03, 1.34945600e+03, 1.52801277e+03, + 1.73019574e+03, 1.95913107e+03, 2.21835857e+03, 2.51188643e+03 }; + +#endif /* LC3_PLUS_HR */ + + static const float *ge_table[LC3_NUM_SRATE] = { + [LC3_SRATE_8K ] = ge_14, [LC3_SRATE_16K ] = ge_18, + [LC3_SRATE_24K ] = ge_22, [LC3_SRATE_32K ] = ge_26, + [LC3_SRATE_48K ] = ge_30, + +#if LC3_PLUS_HR + [LC3_SRATE_48K_HR] = ge_30, [LC3_SRATE_96K_HR] = ge_34, +#endif /* LC3_PLUS_HR */ + }; - float e[LC3_NUM_BANDS]; + float e[LC3_MAX_BANDS]; /* --- Copy and padding --- */ - int nb = LC3_MIN(lc3_band_lim[dt][sr][LC3_NUM_BANDS], LC3_NUM_BANDS); - int n2 = LC3_NUM_BANDS - nb; + int nb = lc3_num_bands[dt][sr]; + int n4 = nb < 32 ? 32 % nb : 0; + int n2 = nb < 32 ? nb - n4 : LC3_MAX_BANDS - nb; - for (int i2 = 0; i2 < n2; i2++) - e[2*i2 + 0] = e[2*i2 + 1] = eb[i2]; + for (int i4 = 0; i4 < n4; i4++) + e[4*i4 + 0] = e[4*i4 + 1] = + e[4*i4 + 2] = e[4*i4 + 3] = eb[i4]; - memcpy(e + 2*n2, eb + n2, (nb - n2) * sizeof(float)); + for (int i2 = n4; i2 < n4+n2; i2++) + e[2*(n4+i2) + 0] = e[2*(n4+i2) + 1] = eb[i2]; + + memcpy(e + 4*n4 + 2*n2, eb + n4 + n2, (nb - n4 - n2) * sizeof(float)); /* --- Smoothing, pre-emphasis and logarithm --- */ @@ -269,7 +305,7 @@ LC3_HOT static void compute_scale_factors( float e0 = e[0], e1 = e[0], e2; float e_sum = 0; - for (int i = 0; i < LC3_NUM_BANDS-1; ) { + for (int i = 0; i < LC3_MAX_BANDS-1; ) { e[i] = (e0 * 0.25f + e1 * 0.5f + (e2 = e[i+1]) * 0.25f) * ge[i]; e_sum += e[i++]; @@ -280,13 +316,13 @@ LC3_HOT static void compute_scale_factors( e_sum += e[i++]; } - e[LC3_NUM_BANDS-1] = (e0 * 0.25f + e1 * 0.75f) * ge[LC3_NUM_BANDS-1]; - e_sum += e[LC3_NUM_BANDS-1]; + e[LC3_MAX_BANDS-1] = (e0 * 0.25f + e1 * 0.75f) * ge[LC3_MAX_BANDS-1]; + e_sum += e[LC3_MAX_BANDS-1]; float noise_floor = fmaxf(e_sum * (1e-4f / 64), 0x1p-32f); - for (int i = 0; i < LC3_NUM_BANDS; i++) - e[i] = fast_log2f(fmaxf(e[i], noise_floor)) * 0.5f; + for (int i = 0; i < LC3_MAX_BANDS; i++) + e[i] = lc3_log2f(fmaxf(e[i], noise_floor)) * 0.5f; /* --- Grouping & scaling --- */ @@ -309,8 +345,13 @@ LC3_HOT static void compute_scale_factors( (e[61] + e[62]) * 3.f/12 ; scf_sum += scf[15]; + float cf = lc3_hr(sr) ? 0.6f : 0.85f; + if (lc3_hr(sr) && 8 * nbytes > + (dt < LC3_DT_10M ? 1150 * (int)(1 + dt) : 4400)) + cf *= dt < LC3_DT_10M ? 0.25f : 0.35f; + for (int i = 0; i < 16; i++) - scf[i] = 0.85f * (scf[i] - scf_sum * 1.f/16); + scf[i] = cf * (scf[i] - scf_sum * 1.f/16); /* --- Attack handling --- */ @@ -564,25 +605,27 @@ LC3_HOT static void unquantize(int lfcb_idx, int hfcb_idx, */ static void enum_mvpq(const int *c, int n, int *idx, bool *ls) { - int ci, i, j; + int ci, i; /* --- Scan for 1st significant coeff --- */ - for (i = 0, c += n; (ci = *(--c)) == 0 ; i++); + for (i = 0, c += n; (ci = *(--c)) == 0 && i < 15; i++); *idx = 0; *ls = ci < 0; /* --- Scan remaining coefficients --- */ - for (i++, j = LC3_ABS(ci); i < n; i++, j += LC3_ABS(ci)) { + unsigned j = LC3_ABS(ci); + + for (i++; i < n; i++, j += LC3_ABS(ci)) { if ((ci = *(--c)) != 0) { *idx = (*idx << 1) | *ls; *ls = ci < 0; } - *idx += lc3_sns_mpvq_offsets[i][j]; + *idx += lc3_sns_mpvq_offsets[i][LC3_MIN(j, 10)]; } } @@ -680,7 +723,7 @@ LC3_HOT static void spectral_shaping(enum lc3_dt dt, enum lc3_srate sr, { /* --- Interpolate scale factors --- */ - float scf[LC3_NUM_BANDS]; + float scf[LC3_MAX_BANDS]; float s0, s1 = inv ? -scf_q[0] : scf_q[0]; scf[0] = scf[1] = s1; @@ -694,21 +737,25 @@ LC3_HOT static void spectral_shaping(enum lc3_dt dt, enum lc3_srate sr, scf[62] = s1 + 0.125f * (s1 - s0); scf[63] = s1 + 0.375f * (s1 - s0); - int nb = LC3_MIN(lc3_band_lim[dt][sr][LC3_NUM_BANDS], LC3_NUM_BANDS); - int n2 = LC3_NUM_BANDS - nb; + int nb = lc3_num_bands[dt][sr]; + int n4 = nb < 32 ? 32 % nb : 0; + int n2 = nb < 32 ? nb - n4 : LC3_MAX_BANDS - nb; + + for (int i4 = 0; i4 < n4; i4++) + scf[i4] = 0.25f * (scf[4*i4+0] + scf[4*i4+1] + + scf[4*i4+2] + scf[4*i4+3]); - for (int i2 = 0; i2 < n2; i2++) - scf[i2] = 0.5f * (scf[2*i2] + scf[2*i2+1]); + for (int i2 = n4; i2 < n4+n2; i2++) + scf[i2] = 0.5f * (scf[2*(n4+i2)] + scf[2*(n4+i2)+1]); - if (n2 > 0) - memmove(scf + n2, scf + 2*n2, (nb - n2) * sizeof(float)); + memmove(scf + n4 + n2, scf + 4*n4 + 2*n2, (nb - n4 - n2) * sizeof(float)); /* --- Spectral shaping --- */ const int *lim = lc3_band_lim[dt][sr]; for (int i = 0, ib = 0; ib < nb; ib++) { - float g_sns = fast_exp2f(-scf[ib]); + float g_sns = lc3_exp2f(-scf[ib]); for ( ; i < lim[ib+1]; i++) y[i] = x[i] * g_sns; @@ -723,7 +770,8 @@ LC3_HOT static void spectral_shaping(enum lc3_dt dt, enum lc3_srate sr, /** * SNS analysis */ -void lc3_sns_analyze(enum lc3_dt dt, enum lc3_srate sr, +void lc3_sns_analyze( + enum lc3_dt dt, enum lc3_srate sr, int nbytes, const float *eb, bool att, struct lc3_sns_data *data, const float *x, float *y) { @@ -737,7 +785,7 @@ void lc3_sns_analyze(enum lc3_dt dt, enum lc3_srate sr, float scf[16], cn[4][16]; int c[4][16]; - compute_scale_factors(dt, sr, eb, att, scf); + compute_scale_factors(dt, sr, nbytes, eb, att, scf); resolve_codebooks(scf, &data->lfcb, &data->hfcb); @@ -756,7 +804,8 @@ void lc3_sns_analyze(enum lc3_dt dt, enum lc3_srate sr, /** * SNS synthesis */ -void lc3_sns_synthesize(enum lc3_dt dt, enum lc3_srate sr, +void lc3_sns_synthesize( + enum lc3_dt dt, enum lc3_srate sr, const lc3_sns_data_t *data, const float *x, float *y) { float scf[16], cn[16]; |