Commit bf8cb08f authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2300-remove-unused-code-in-core-coder-hq-core' into 'main' 

Resolve "Remove unused code in core-coder: HQ core"

See merge request !2683
parents 4980593f 3cef7c2b

lib_com/hq2_core_com_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void mdct_spectrum_denorm_fx( 
    return;

}





#ifndef CLEANUP_HQ_CORE

void mdct_spectrum_denorm_ivas_fx(

    const Word32 inp_vector[],    /* i   : Q0  :                                       */

    Word32 L_y2[],                /* i/o : Qs  : decoded spectrum                      */
@@ -373,6 +373,7 @@ void mdct_spectrum_denorm_ivas_fx( 


    return;

}

#endif



/*==========================================================================*/

/* FUNCTION      : void hq2_core_configure_fx()                             */

lib_com/ivas_prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -1593,6 +1593,7 @@ void ivas_hq_core_dec_fx( 
    Word16 *Q_output 

);



#ifdef CLEANUP_HQ_CORE

void ivas_HQ_FEC_Mem_update_fx(

    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */

    Word32 *t_audio_q_fx,                                       /*Q12*/
@@ -1608,7 +1609,7 @@ void ivas_HQ_FEC_Mem_update_fx( 
    Word16 hq_core_type,                                        /* i : normal or low-rate MDCT(HQ) core         */

    Word16 output_frame 

);



#endif

/* o  : Consumed bits  Q0 */

Word16 ivas_hq_classifier_dec_fx(                          

    Decoder_State *st_fx,                                       /* i/o: decoder state structure                 */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */

#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */

#define HARM_LSF_ENC                                    /* VA: basop issue 2301: Remove duplicated code in LSF quantizer */

#define CLEANUP_HQ_CORE                                 /* VA: basop issue 2300: Remove unused code in core-coder: HQ core */



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+4 −2
Original line number Diff line number Diff line
@@ -2279,6 +2279,7 @@ void mdct_spectrum_denorm_fx( 
    const Word16 pd_thresh_fx     /* i   : Q15 :                                       */

);













#ifndef CLEANUP_HQ_CORE















void mdct_spectrum_denorm_ivas_fx(















    const Word32 inp_vector[],    /* i   : Q0  :                                       */















    Word32 L_y2[],                /* i/o : Qs  : decoded spectrum                      */









@@ -2291,7 +2292,7 @@ void mdct_spectrum_denorm_ivas_fx(













    const Word16 ld_slope_fx,     /* i   : Q15 :                                       */















    const Word16 pd_thresh_fx     /* i   : Q15 :                                       */















);

























#endif















void hq2_core_configure_fx(















    const Word16 frame_length, /* Q0 */















    const Word16 num_bits,     /* Q0 */










@@ -3886,6 +3887,7 @@ void swb_bwe_enc_lr_fx(













    Word16 *ni_seed_fx            /* i/o: random seed for search buffer NI             */















);



























#ifndef CLEANUP_HQ_CORE















void swb_bwe_enc_lr_ivas_fx(















    Encoder_State *st_fx,    /* i/o: encoder state structure                      */















    const Word32 L_m_core[], /* i  : lowband synthesis                            */









@@ -3910,7 +3912,7 @@ void swb_bwe_enc_lr_ivas_fx(













    const Word32 L_y2_ni[],       /* i  : band_width information                       */















    Word16 *ni_seed_fx            /* i/o: random seed for search buffer NI             */















);

























#endif















void isf_enc_amr_wb_fx(















    Encoder_State *st, /* i/o: state structure                             */















    Word16 *isf_new,   /* i/o: quantized ISF vector                        */

































lib_dec/FEC_HQ_core_fx.c



+2
−1




























Original line number
Diff line number
Diff line








@@ -399,6 +399,7 @@ void HQ_FEC_processing_fx(













    return;















}





























#ifndef CLEANUP_HQ_CORE















void ivas_HQ_FEC_Mem_update_fx(















    Decoder_State *st_fx, /* i/o: decoder state structure            */















    Word32 *t_audio_q_fx, /*Q12*/










@@ -677,7 +678,7 @@ void ivas_HQ_FEC_Mem_update_fx(





























    return;















}



























#endif















void HQ_FEC_Mem_update_fx(















    Decoder_State *st_fx, /* i/o: decoder state structure            */















    Word32 *t_audio_q_fx, /*Q12*/