Commit 08bf4f25 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Fixed point conversion of ism_dec and sub-funcs 

[x] Few funcs in ism_dec, mc_param_dec converted to fixed point.
[x] BASOP updates in few files.
parent d3eb5be5

Workspace_msvc/lib_dec.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
@@ -303,6 +304,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct.c" />

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+4 −0
Original line number Diff line number Diff line
@@ -825,6 +825,10 @@ 
      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

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

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

Workspace_msvc/lib_rend.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_hrtf.c" />

    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_crend.c" />

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ 
    <ClCompile Include="..\lib_rend\ivas_td_decorr.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c">

      <Filter>rend_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_rend\lib_rend.h" />

lib_com/ivas_prot.h

+9 −2
Original line number Diff line number Diff line
@@ -1102,6 +1102,14 @@ void ivas_param_ism_config( 
ivas_error ivas_ism_enc_config(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                      */

);

#ifdef IVAS_FLOAT_FIXED

ivas_error ivas_ism_dec_config(

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

    const ISM_MODE last_ism_mode, /* i/o: last ISM mode                       */

    UWord16 *nSamplesRendered,   /* o  : number of samples flushed when the renderer granularity changes */

    Word16 *data                 /* o  : output synthesis signal                 */

);

#else



ivas_error ivas_ism_dec_config(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */
@@ -1109,6 +1117,7 @@ ivas_error ivas_ism_dec_config( 
    uint16_t *nSamplesRendered,                                 /* o  : number of samples flushed on renderer change*/

    int16_t *data                                               /* o  : output synthesis signal                     */

);

#endif // IVAS_FLOAT_FIXED



ivas_error ivas_param_ism_dec_open(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */
@@ -4774,7 +4783,6 @@ void ivas_transient_det_close( 
    ivas_trans_det_state_t **hTranDet                           /* i/o: Transient detector handle               */

);



#ifndef IVAS_FLOAT_FIXED

void ivas_transient_det_process( 

    ivas_trans_det_state_t *hTranDet,                           /* i/o: SPAR TD handle                          */

    float *pIn_pcm,                                             /* i  : input audio channels                    */
@@ -4790,7 +4798,6 @@ void ivas_td_decorr_get_ducking_gains( 
    const int16_t frame_len,

    const int16_t tdet_flag 

);

#endif



#define IVAS_CMULT_FLOAT( in1_re, in1_im, in2_re, in2_im, out1_re, out1_im ) \

    out1_re = ( in1_re * in2_re ) - ( in1_im * in2_im ); MAC(1); MULT(1);    \