Commit 6e928559 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Remove EVS_FLOAT_ENC macro dependency

parent a7716790

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ ivas_error ivas_sba_enc_reconfigure( 
);



void destroy_sce_enc(

    SCE_ENC_HANDLE hSCE                                         /* i/o: SCE encoder structure                   */

    SCE_ENC_HANDLE hSCE,                                        /* i/o: SCE encoder structure                   */

    Flag is_evs                                                 /* i  : Flag to indicate EVS encoder            */  

);



void destroy_cpe_enc(

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
#define FIX_TMP_714

#define BASOP_NOGLOB_TMP_715

#define EVS_FUNC_MODIFIED

#define EVS_FLOAT_ENC

//#define EVS_FLOAT_ENC

#define FIX_667_DISABLE_INITIAL_PLC_SUPPRESSION

#define IVAS_CNST

#define REMOVE_IVAS_UNUSED_PARAMETERS_WARNING  /*temporary operation on unused EVS parameters to remove warnings, these parameters will be used in IVAS */

lib_enc/ivas_corecoder_enc_reconfig.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                mvr2r( st_ivas->hSCE[sce_id]->hCoreCoder[0]->input_buff, input_buff[sce_id], len_inp_memory );

            }



            destroy_sce_enc( st_ivas->hSCE[sce_id] );

            destroy_sce_enc( st_ivas->hSCE[sce_id], (EQ_16(st_ivas->hEncoderConfig->element_mode_init, EVS_MONO) && !st_ivas->hEncoderConfig->stereo_dmx_evs) );

            st_ivas->hSCE[sce_id] = NULL;

        }

lib_enc/ivas_init_enc.c

+22 −15
Original line number Diff line number Diff line
@@ -738,17 +738,21 @@ ivas_error ivas_init_encoder( 
        st_ivas->nCPE = 0;

        st_ivas->nchan_transport = 1;

        sce_id = 0;

#ifdef EVS_FLOAT_ENC



        IF(NE_16(st_ivas->hEncoderConfig->element_mode_init, EVS_MONO) || st_ivas->hEncoderConfig->stereo_dmx_evs)

        {

          if ( ( error = create_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )

          {

              return error;

          }

#else

        }

        ELSE

        {

          if ( ( error = create_evs_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )

          {

              return error;

          }

#endif

        }



        /* prepare stereo downmix for EVS */

        if ( hEncoderConfig->stereo_dmx_evs == 1 )
@@ -1360,17 +1364,20 @@ ivas_error ivas_init_encoder_fx( 
        st_ivas->nCPE = 0;

        st_ivas->nchan_transport = 1;

        sce_id = 0;

#ifndef EVS_FLOAT_ENC

        IF(EQ_16(st_ivas->hEncoderConfig->element_mode_init, EVS_MONO) && !st_ivas->hEncoderConfig->stereo_dmx_evs)

        {

          if ( ( error = create_evs_sce_enc( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )

          {

              return error;

          }

#else

        }

        ELSE

        {

          IF( ( error = create_sce_enc_fx( st_ivas, sce_id, ivas_total_brate ) ) != IVAS_ERR_OK )

          {

              return error;

          }

#endif

        }



        /* prepare stereo downmix for EVS */

        IF( hEncoderConfig->stereo_dmx_evs == 1 )
@@ -2024,7 +2031,7 @@ void ivas_destroy_enc( 
    {

        if ( st_ivas->hSCE[i] != NULL )

        {

            destroy_sce_enc( st_ivas->hSCE[i] );

            destroy_sce_enc( st_ivas->hSCE[i], (EQ_16(st_ivas->hEncoderConfig->element_mode_init, EVS_MONO) && !st_ivas->hEncoderConfig->stereo_dmx_evs) );

            st_ivas->hSCE[i] = NULL;

        }

    }

lib_enc/ivas_sce_enc.c

+11 −10
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ ivas_error create_sce_enc_fx( 
    return error;

}

#endif

#ifndef EVS_FLOAT_ENC



/*-------------------------------------------------------------------------

 * create_evs_sce_enc()

 *
@@ -578,7 +578,7 @@ ivas_error create_evs_sce_enc( 


    return error;

}

#endif



/*-------------------------------------------------------------------------

 * destroy_sce_enc()

 *
@@ -586,26 +586,27 @@ ivas_error create_evs_sce_enc( 
 *-------------------------------------------------------------------------*/



void destroy_sce_enc(

    SCE_ENC_HANDLE hSCE /* i/o: SCE encoder structure       */

    SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure       */

    Flag is_evs          /* i  : Flag to indicate EVS encoder*/

)

{

    Encoder_State *st;



    st = hSCE->hCoreCoder[0];



#ifndef EVS_FLOAT_ENC

    if ( st != NULL && hSCE->hCoreCoder[0]->element_mode == EVS_MONO )

    IF ( st != NULL )

    {

      IF (EQ_16(st->element_mode, EVS_MONO) && is_evs)

      {

        destroy_encoder_fx( hSCE->hCoreCoder[0] );

        st = NULL;

      }

    else

#endif

        if ( st != NULL )

      ELSE        

      {

        destroy_core_enc( st );

        st = NULL;

      }

    }



    ivas_destroy_MD_bstr_enc( &( hSCE->hMetaData ) );