Commit 0df37ccf authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas_lfe_dec_fxd_conv' into 'main' 

Functions in ivas_lfe_dec.c converted to fixed point.

See merge request !65
parents 99d9e900 afd282aa

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />

    <ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />

    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -818,6 +818,9 @@ 
    <ClCompile Include="..\lib_dec\lib_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\ivas_stat_dec.h">

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,7 @@ typedef enum 
#define IVAS_LFE_MAX_NUM_DCT_PASS_BINS          8

#define IVAS_LFE_MAX_NUM_DCT_COEFFS             (IVAS_LFE_MAX_NUM_DCT_PASS_BINS * IVAS_LFE_NUM_COEFFS_IN_SUBGRP)

#define IVAS_LFE_FADE_NS                        8000000L    /* 8.0 ms */

#define IVAS_LFE_FADE_S_Q15                     263         /* 8.0 ms in Q15 */

#define IVAS_MAX_NUM_QUANT_STRATS               2

#define IVAS_MAX_NUM_DCT_COEF_GROUPS            4

#define IVAS_LFE_SHIFT_BITS                     5

lib_com/ivas_prot_fx.h

+26 −0
Original line number Diff line number Diff line
@@ -490,6 +490,31 @@ void ivas_ism_metadata_sid_dec_fx( 
    Word16 nb_bits_metadata[]      /* o  : number of metadata bits     */

);



//ivas_lfe_dec_fx.c



void ivas_lfe_dec_close_fx(

    LFE_DEC_HANDLE *hLFE /* i/o: LFE encoder handle                      */

);



ivas_error ivas_create_lfe_dec_fx(

  LFE_DEC_HANDLE *hLFE_out,              /* o  : IVAS LFE decoder structure                           */

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

  const Word32 binauralization_delay_ns /* i  : additional LFE delay to sync with binaural renderer  */

);



void ivas_lfe_dec_fx(

  LFE_DEC_HANDLE hLFE,        /* i/o: LFE decoder handle                              */

  Decoder_State *st0,         /* i/o: decoder state structure - for bitstream handling*/

  const Word16 output_frame, /* i  : output frame length per channel                 */

  const Word16 bfi,          /* i  : BFI flag                                        */

  Word32 output_lfe_ch[]       /* o  : output LFE synthesis                            */

);



void ivas_lfe_dec_close_fx(

  LFE_DEC_HANDLE *hLFE /* i/o: LFE decoder handle */

);





void td_stereo_param_updt_fx(

    const Word16 lsp_old_PCh[],        /* i  : primary channel old LSPs                */

    const Word16 lsf_old_PCh[],        /* i  : primary channel old LSFs                */
@@ -518,4 +543,5 @@ void stereo_cng_compute_PScorr_fx( 
    const Word16 L_frame_0, /* i  : L_frame channel 0                       */

    const Word16 L_frame_1  /* i  : L_frame channel 1                       */

);



#endif
 
 No newline at end of file

lib_com/ivas_rom_com.c

+6 −0
Original line number Diff line number Diff line
@@ -3487,11 +3487,17 @@ const int16_t ivas_lfe_num_ele_in_coder_models[2][4] = 
    { 63, 31, 7, 1 },{ 31, 15, 3, 0 }

};













const Word16 ivas_lfe_log2_num_ele_in_coder_models_fx[2][4] =













{













    { 6, 5, 3, 1 },{ 5, 4, 2, 0 }













};



























const int16_t ivas_lfe_num_dct_pass_bins_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 8, 6 };





























const int16_t ivas_lfe_min_shift_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 1, 0 };





























const float ivas_lfe_lpf_delay[2] = { 0.00175f, 0.0035f };













const Word16 ivas_lfe_lpf_delay_Q15[2] = { 57, 114 };





























const double d_hamm_lfe_plc[LFE_PLC_LENANA / 2] =















{