Commit b2f220dd authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'high_mld_masa_fix_float_cleanup' into 'main' 

High MLD fix for MASA, Float code cleanup

See merge request !338
parents 60b1c7b2 af9f3441

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ int main( 
        {

            renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( 1u << 15 ) );

            renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( (1u << 15)-1 ) );

        }

#endif // IVAS_FLOAT_FIXED

lib_com/float_to_fix_ops.c

+2 −451

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_prot_fx.h

+12 −0
Original line number Diff line number Diff line
@@ -2146,10 +2146,22 @@ void ivas_dirac_dec_output_synthesis_cov_close_fx( 
    DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state /* i/o: handle for the covariance synthesis state                                                              */

);



ivas_error ivas_init_decoder_front_fx(

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

);



ivas_error ivas_init_decoder_fx(

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

);



void destroy_core_dec_fx(

    DEC_CORE_HANDLE hCoreCoder                                  /* i/o: core decoder structure                  */

);



void ivas_destroy_dec_fx(

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

);



ivas_error ivas_ism_dec_config_fx(

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

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

lib_com/ivas_sba_config.c

+5 −5
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ void ivas_sba_config_fx( 
        ELSE

        {

            *nSCE = 0;

            *nCPE = shr( *nchan_transport, 2 );

            IF( NE_16( mult( 2, ( *nCPE ) ), *nchan_transport ) )

            *nCPE = shr( *nchan_transport, 1 );

            IF( NE_16( i_mult( 2, ( *nCPE ) ), *nchan_transport ) )

            {

                *nCPE = add( *nCPE, 1 );

            }

lib_com/prot_fx2.h

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2( 
  Word16 last_element_mode,

  const FRAME_MODE frameMode);



void fixed_to_float_stereo_tcx_core_dec(

  Decoder_State *st,

  Word16 *signal_out

);

// Float to Word32

Word32 float_to_fix( float number, Word32 Q );

// Word32 to Float