Commit 13d4e22e authored by vaillancour's avatar vaillancour
Browse files

modification to ensure build even if switch not activated

parent 2a1dbfab

lib_enc/find_uv_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -590,7 +590,9 @@ Word16 find_uv_fx( /* o : coding type 
                        const Word16 last_core_orig,          /* i  : original last core                                            Q0*/

                        STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                   */

                        const Word16 Q_new,

#ifdef FIX_2349_HARM_FIND_UV

                        const Word16 shift,

#endif

                        const Word16 q_hp_E )

{

    Word16 coder_type, i;
@@ -611,16 +613,18 @@ Word16 find_uv_fx( /* o : coding type 
    SC_VBR_ENC_HANDLE hSC_VBR = st_fx->hSC_VBR;

    Word16 Last_Resort;

    Word16 vadnoise;

#ifdef FIX_2349_HARM_FIND_UV

    Word16 Q_in, loc_lp_noise;



    Q_in = Q_new;

    move16();



#ifdef FIX_2349_HARM_FIND_UV

    if( st_fx->element_mode == EVS_MONO )

    {

        Q_in = sub( Q_new, 1 );

    }

#endif



    IF( hSC_VBR != NULL )

    {

        Last_Resort = hSC_VBR->Last_Resort; /* Q0 */

lib_enc/prot_fx_enc.h

+4 −1
Original line number Diff line number Diff line
@@ -261,8 +261,11 @@ Word16 find_uv_fx( 
    const Word16 last_core_orig,          /* i  : original last core                                            Q0*/

    STEREO_CLASSIF_HANDLE hStereoClassif, /* i/o: stereo classifier structure                                   */

    const Word16 Q_new,

#ifdef FIX_2349_HARM_FIND_UV

    const Word16 shift,

    const Word16 q_hp_E );

#endif

    const Word16 q_hp_E 

);



#ifndef FIX_2349_HARM_FIND_UV

/* o  : coding type */