Commit 3901e701 authored by vaclav's avatar vaclav
Browse files

EVS decoder updates: bring BAO closer to FLP wrt. function names

parent 31b60873

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com_fx.c" />

    <ClCompile Include="..\lib_com\syn_12k8_fx.c" />

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />

Workspace_msvc/lib_com.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_com.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\swb_tbe_com.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\tcx_mdct_window.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

lib_com/cldfb_evs.c

+22 −27
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void calcModulationAndFolding( Word16 *rY, 
}





/* cldfbAnalysisFiltering

/* cldfbAnalysis_fx



   Parameters:

     cldfbBank          I/O: handle to analysis CLDFB filter struct
@@ -356,7 +356,8 @@ static void calcModulationAndFolding( Word16 *rY, 
   Returns:

      void

*/

void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,

void cldfbAnalysis_fx(

    HANDLE_CLDFB_FILTER_BANK cldfbBank,

    Word32 **rAnalysis,

    Word32 **iAnalysis,

    CLDFB_SCALE_FACTOR *scaleFactor,
@@ -610,7 +611,7 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank, 
}





/* cldfbSynthesisFiltering

/* cldfbSynthesis_fx



   Parameters:

     cldfbBank          I/O: handle to analysis CLDFB filter struct
@@ -629,7 +630,8 @@ void cldfbAnalysisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank, 
   Returns:

      void

*/

void cldfbSynthesisFiltering( HANDLE_CLDFB_FILTER_BANK cldfbBank,

void cldfbSynthesis_fx(

    HANDLE_CLDFB_FILTER_BANK cldfbBank,

    Word32 **rAnalysis,

    Word32 **iAnalysis,

    const CLDFB_SCALE_FACTOR *scaleFactor,
@@ -1186,20 +1188,13 @@ void analysisCldfbEncoder_fx( 
    }



    /* perform analysis */

    cldfbAnalysisFiltering(

        st_fx->cldfbAnaEnc,

        ppBuf_Real,

        ppBuf_Imag,

        scale,

        timeIn,

        0,

        CLDFB_NO_COL_MAX,

        workBuffer );

    cldfbAnalysis_fx( st_fx->cldfbAnaEnc, ppBuf_Real, ppBuf_Imag, scale, timeIn, 0, CLDFB_NO_COL_MAX, workBuffer );



    enerScale.lb_scale = negate( scale->lb_scale );

    enerScale.lb_scale16 = negate( scale->lb_scale );

    move16();

    move16();



    /* get 16bit respresentation */

    AnalysisPostSpectrumScaling_Fx(

        st_fx->cldfbAnaEnc,

lib_com/ivas_prot_fx.h

+0 −14
Original line number Diff line number Diff line
@@ -2289,20 +2289,6 @@ ivas_error ivas_mct_dec_fx( 
    const Word16 output_frame,    /* i  : output frame length per channel */

    const Word16 nb_bits_metadata /* i  : number of metadata bits         */

);

void swb_tbe_reset_synth_ivas_fx(

    Word32 genSHBsynth_Hilbert_Mem[],

    Word16 genSHBsynth_state_lsyn_filt_shb_local_fx[],

    Word32 genSHBsynth_state_lsyn_filt_shb_local_fx_32[] );



void InitSWBdecBuffer_ivas_fx(

    Decoder_State *st_fx /* i/o: SHB decoder structure */

);



void td_bwe_dec_init_ivas_fx(

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

    TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle      */

    const Word32 output_Fs     /* i  : output sampling rate    */

);



void ivas_dirac_dec_render_sf_fx(

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

lib_com/modif_fs.c

+9 −4
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ 
#include "wmc_auto.h"





void Interpolate_allpass_steep_32(

/* IVAS 32-bit variant */

void Interpolate_allpass_steep_fx32(

    const Word32 *in_fx, /* i  : input array of size N        Qx */

    Word32 *mem_fx,      /* i/o: memory                       Qx */

    const Word16 N,      /* i  : number of input samples         */
@@ -101,6 +102,8 @@ void Interpolate_allpass_steep_32( 


    return;

}



/* IVAS 32-bit variant */

void Decimate_allpass_steep_fx32(

    const Word32 *in, /* i  : input array of size N                  Qx */

    Word32 *mem,      /* i/o: memory                                 Qx */
@@ -251,7 +254,9 @@ void Decimate_allpass_steep_fx32( 


    return;

}

void interpolate_3_over_2_allpass_32(



/* IVAS 32-bit variant */

void interpolate_3_over_2_allpass_fx32(

    const Word32 *input, /* i  : input signal            Qx*/

    const Word16 len,    /* i  : number of input samples   */

    Word32 *out,         /* o  : output signal           Qx*/
@@ -377,8 +382,8 @@ void interpolate_3_over_2_allpass_32( 
    return;

}





void interpolate_3_over_1_allpass_32(

/* IVAS 32-bit variant */

void interpolate_3_over_1_allpass_fx32(

    const Word32 *input, /* i  : input signal                    Qx */

    const Word16 len,    /* i  : number of input samples            */

    Word32 *out,         /* o  : output signal                      */