Commit 39c39f49 authored by multrus's avatar multrus
Browse files

[cleanup] accept SNS_MSVQ

parent 52ab5034

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -864,14 +864,12 @@ enum fea_names 


#define SNS_LOW_BR_MODE                         -1

#define SNS_NPTS                                16 /* Number of downsampled SNS parameters */

#ifdef SNS_MSVQ

#define SNS_STEREO_MODE_LR                      0

#define SNS_STEREO_MODE_MS                      1

#define SNS_STEREO_MODE_OFFSET_INDICES          4

#define SNS_MSVQ_NSTAGES_TCX20                  4

#define SNS_MSVQ_NSTAGES_TCX10                  3

#define SNS_MSVQ_NSTAGES_SIDE                   2

#endif

#ifdef FIX_445_SNS_BUGFIXES

#define SNS_CDBKS_BITS_4_FRAC                   12

#define SNS_MEANS_BITS_4_FRAC                   14

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -2545,7 +2545,6 @@ void sns_shape_spectrum( 
    const int16_t L_frame                                       /* i  : frame length                                                */

);



#ifdef SNS_MSVQ

int16_t quantize_sns(

    float sns_in[CPE_CHANNELS][NB_DIV][M],

    float snsQ_out[CPE_CHANNELS][NB_DIV][M],
@@ -2560,7 +2559,6 @@ void dequantize_sns( 
    float snsQ_out[CPE_CHANNELS][NB_DIV][M],

    Decoder_State **sts

);

#endif



void sns_avq_cod(

    const float *sns,                                           /* i  : Input sns vectors                       */
@@ -2589,11 +2587,7 @@ void sns_avq_cod_stereo( 


void sns_avq_dec(

    int16_t *index,                                             /* i  : Quantization indices                    */

#ifdef SNS_MSVQ

    float SNS_Q[NB_DIV][M],                                     /* o  : Quantized SNS vectors                   */

#else

    float *SNS_Q,                                               /* o  : Quantized SNS vectors                   */

#endif

#ifdef FIX_445_SNS_BUGFIXES

    const int16_t L_frame,

#endif

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -5629,7 +5629,6 @@ const int16_t ivas_num_active_bands[FB - WB + 1] = 
    IVAS_16K_12BANDS_ACTIVE_BANDS, IVAS_FB_BANDS_12, IVAS_FB_BANDS_12

};













#ifdef SNS_MSVQ















const int16_t ivas_sns_cdbks_tcx20_levels[SNS_MSVQ_NSTAGES_TCX20] = { 128, 64, 32, 32 };















const int16_t ivas_sns_cdbks_tcx20_bits[SNS_MSVQ_NSTAGES_TCX20] = { 7, 6, 5, 5 };
























@@ -6808,7 +6807,6 @@ const float ivas_sns_cdbks_side_tcx10_stage2[ 8 * 16 ] = {



























const float *const ivas_sns_cdbks_side_tcx10[SNS_MSVQ_NSTAGES_SIDE] = { ivas_sns_cdbks_side_tcx10_stage1, ivas_sns_cdbks_side_tcx10_stage2 };















#endif













#endif // SNS_MSVQ





























#ifdef FIX_445_SNS_BUGFIXES















const int16_t sns_1st_cdbk[2][2][8 * 32] = {

























lib_com/ivas_rom_com.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -431,7 +431,6 @@ extern const float ivas_fb_resp_cheby_ramp_16del[IVAS_FB_1MS_16K_SAMP + 1];





























extern const int16_t ivas_num_active_bands[FB - WB + 1];





























#ifdef SNS_MSVQ















/*------------------------------------------------------------------------------------------*















 * SNS MSVQ codebooks and means















 *------------------------------------------------------------------------------------------*/










@@ -475,7 +474,6 @@ extern const float ivas_sns_means_side_tcx20[];













extern const float *const ivas_sns_cdbks_side_tcx10[];















extern const float ivas_sns_means_side_tcx10[];















#endif













#endif































#ifdef MC_PARAMUPMIX_MODE















extern ACPL_QUANT_TABLE alpha_quant_table[];

































lib_com/options.h



+0
−1




























Original line number
Diff line number
Diff line








@@ -145,7 +145,6 @@



























































#define SNS_MSVQ                                        /* FhG: contribution 33 - MSVQ for SNS parameters at stereo mid bitrates */















/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/































#define FIX_379_GAININTP                                /* Eri: Adds a gain interpolation for directional/distance gain to handle abrupt changes in metadata (Non BE) */