Commit 2b2acfdb authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2310-remove-unused-code-in-core-coder-cam' into 'main' 

Remove unused code in core-coder: CAM

See merge request !2691
parents ec04ed46 c72e92b7

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
#define CLEANUP_HQ_CORE                                 /* VA: basop issue 2300: Remove unused code in core-coder: HQ core */

#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define FIX_2294_CLANG_18_WARNINGS_ENC                  /* VA: Fix some encoder clang-18 warnings, desc. in 2294 */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */



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

lib_enc/decision_matrix_enc_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -752,13 +752,15 @@ void signalling_enc_fx( 
}



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

 * signalling_enc_rf()

 * signaling_enc_rf()

 *

 * write channel-aware signalling information into the bitstream

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



void signaling_enc_rf_fx(

    Encoder_State *st /* i  : encoder state structure   */

)

#ifndef REMOVE_CAM_FROM_IVAS

{

    Word16 i;

    Word16 sfr;
@@ -833,6 +835,7 @@ void signaling_enc_rf_fx( 
void signalling_enc_rf_fx(

    Encoder_State *st /* i  : encoder state structure   */

)

#endif

{

    Word16 i;

    Word16 sfr;

lib_enc/enc_prm_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -93,13 +93,14 @@ static void enc_prm_hm_ivas_fx( 
    }

}





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

 * Function  enc_prm_rf_fx()                                       *

 * ~~~~~~~~~~~~~~~~~~~~~~                                          *

 *                                                                 *

 * encode RF parameters for ACELP and TCX partial copy             *

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



#ifndef REMOVE_CAM_FROM_IVAS

void enc_prm_rf_ivas_fx(

    Encoder_State *st,

    const Word16 rf_frame_type, /* Q0 */
@@ -271,6 +272,8 @@ void enc_prm_rf_ivas_fx( 
    /* write RF frame type last in the bitstream */

    push_next_indice( hBstr, rf_frame_type, 3 );

}

#endif



void enc_prm_rf_fx(

    Encoder_State *st,

    const Word16 rf_frame_type, /* Q0 */

lib_enc/evs_enc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -531,7 +531,15 @@ ivas_error evs_enc_fx( 
     * Channel-aware mode - write signaling information into the bitstream

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



#ifdef REMOVE_CAM_FROM_IVAS

    signaling_enc_rf_fx( st );



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

     * Updates

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

#else

    signalling_enc_rf_fx( st );

#endif



    updt_enc_common_fx( st, Etot, Q_new );

lib_enc/ivas_core_enc_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -834,12 +834,13 @@ ivas_error ivas_core_enc_fx( 
        st->q_inp = q_inp[1];

        move16();



#ifndef REMOVE_CAM_FROM_IVAS

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

         * Channel-aware mode - write signaling information into the bitstream

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



        signaling_enc_rf_fx( st );



#endif

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

         * Common updates

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