Commit 2ae25034 authored by multrus's avatar multrus
Browse files

[cleanup] accept MC_PARAMUPMIX_MODE

parent 917d2824

lib_com/ivas_cnst.h

+0 −6
Original line number Diff line number Diff line
@@ -1284,12 +1284,8 @@ typedef enum 
    MC_MODE_NONE,

    MC_MODE_MCT,

    MC_MODE_PARAMMC,

#ifndef MC_PARAMUPMIX_MODE

    MC_MODE_MCMASA

#else

    MC_MODE_MCMASA,

    MC_MODE_PARAMUPMIX

#endif

} MC_MODE;



typedef enum
@@ -1349,7 +1345,6 @@ typedef enum 
    MCT_CHAN_MODE_IGNORE

} MCT_CHAN_MODE;



#ifdef MC_PARAMUPMIX_MODE

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

 * MC Param-Upmix Mode Constants

 *----------------------------------------------------------------------------------*/
@@ -1399,7 +1394,6 @@ typedef struct 
} HUFF_NODE_TABLE;





#endif

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

 * Parametric MC Constants

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

lib_com/ivas_mc_com.c

+0 −7
Original line number Diff line number Diff line
@@ -103,12 +103,6 @@ MC_MODE ivas_mc_mode_select( 
            {

                mc_mode = MC_MODE_MCMASA;

            }

#ifndef MC_PARAMUPMIX_MODE

            else if ( total_brate < IVAS_192k )

            {

                mc_mode = MC_MODE_PARAMMC;

            }

#else

            else if ( total_brate < IVAS_160k )

            {

                mc_mode = MC_MODE_PARAMMC;
@@ -117,7 +111,6 @@ MC_MODE ivas_mc_mode_select( 
            {

                mc_mode = MC_MODE_PARAMUPMIX;

            }

#endif

            break;

        default:

            assert( 0 && "LS Setup not supported or defined for MC mode!\n" );

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -3955,7 +3955,6 @@ void calculate_hodirac_sector_parameters( 
);

#endif



#ifdef MC_PARAMUPMIX_MODE

void ivas_mc_paramupmix_enc(

    Encoder_Struct *st_ivas,                                        /* i/o: IVAS Encoder handle                             */

    BSTR_ENC_HANDLE hMetaData,                                      /* i/o: IVAS Metadata bitstream handle                  */
@@ -3996,7 +3995,6 @@ void ivas_mc_paramupmix_dec_read_BS( 
    MC_PARAMUPMIX_DEC_HANDLE hMCParamUpmix,                         /* i/o: decoder MC Param-Upmix handle                   */

    int16_t *nb_bits                                                /* o  : number of bits written                          */

);

#endif



void ivas_param_mc_metadata_open(

    const MC_LS_SETUP mc_ls_setup,                              /* i  : MC ls setup                                         */
@@ -4869,14 +4867,12 @@ void ivas_td_decorr_process( 
    const int16_t output_frame                                  /* i  : output frame length                     */

);



#ifdef MC_PARAMUPMIX_MODE

void ivas_td_decorr_APD_iir_filter(

    ivas_td_decorr_APD_filt_state_t *filter_state,

    float *pIn_out,

    const int16_t num_APD_sections,

    const int16_t length

);

#endif



#define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \

    out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1);    \
@@ -5404,9 +5400,7 @@ void ivas_ls_setup_conversion_close( 


void ivas_ls_setup_conversion(

    Decoder_Struct *st_ivas,                                    /* i  : IVAS decoder structure                          */

#ifdef MC_PARAMUPMIX_MODE

    const int16_t input_chans,                                  /* i  : number of input channels to the renderer        */

#endif

    const int16_t output_frame,                                 /* i  : frame length                                    */

#ifdef JBM_TSM_ON_TCS

    float *input[],             /* i  : LS input/output synthesis signal */

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -6370,7 +6370,6 @@ const int16_t sns_1st_means_32k[2][16] = { 
    }

};













#ifdef MC_PARAMUPMIX_MODE















ACPL_QUANT_TABLE alpha_quant_table[] =















{















  {  /* Alfa Fine */










@@ -6466,6 +6465,5 @@ ACPL_QUANT_TABLE beta_quant_table[2][9] =













    } /* End Beta Coarse #5 */















  }















};













#endif





























/* clang-format on */

























lib_com/ivas_rom_com.h



+0
−2




























Original line number
Diff line number
Diff line








@@ -449,10 +449,8 @@ extern const int16_t ivas_sns_cdbks_side_tcx10_bits[];













extern const float *const ivas_sns_cdbks_side_tcx20[];















extern const float *const ivas_sns_cdbks_side_tcx10[];





























#ifdef MC_PARAMUPMIX_MODE















extern ACPL_QUANT_TABLE alpha_quant_table[];















extern ACPL_QUANT_TABLE beta_quant_table[2][9];













#endif































/* means and codebooks for the split VQ in the 2-stage SNS VQ */















extern const int16_t sns_1st_cdbk[2][2][8 * 32];