Commit 4c758550 authored by eichenseer's avatar eichenseer
Browse files

Some tweaks in handle initialization and closing.

parent 6f54f2b0

lib_dec/ivas_init_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -2412,6 +2412,9 @@ void ivas_initialize_handles_dec( 


    /* spatial coding handles */

    st_ivas->hDirAC = NULL;

#ifdef PARAM_ISM_REFACTOR

    st_ivas->hParamIsmDec = NULL;

#endif

    st_ivas->hSpar = NULL;

    st_ivas->hMasa = NULL;

    st_ivas->hQMetaData = NULL;

lib_enc/ivas_init_enc.c

+12 −4
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ void ivas_initialize_handles_enc( 
    /* DirAC handle */

    st_ivas->hDirAC = NULL;



#ifdef PARAM_ISM_REFACTOR

    /* ParamISM handle */

    st_ivas->hParamIsm = NULL;

#endif

    /* SPAR handle */

    st_ivas->hSpar = NULL;
@@ -1146,19 +1150,23 @@ void ivas_destroy_enc( 
    /* Q Metadata handle */

    ivas_qmetadata_close( &( st_ivas->hQMetaData ) );



#ifndef PARAM_ISM_REFACTOR

    /* DirAC handle */

    if ( ivas_format == ISM_FORMAT )

    {

#ifndef PARAM_ISM_REFACTOR

        ivas_param_ism_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );

#else

        ivas_param_ism_enc_close( &( st_ivas->hParamIsm ), st_ivas->hEncoderConfig->input_Fs );

#endif

    }

    else

    {

        ivas_dirac_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );

    }

#else

    /* DirAC handle */

    ivas_dirac_enc_close( &( st_ivas->hDirAC ), st_ivas->hEncoderConfig->input_Fs );



    /* ParamISM handle */

    ivas_param_ism_enc_close( &( st_ivas->hParamIsm ), st_ivas->hEncoderConfig->input_Fs );

#endif



    /* SPAR handle */

    ivas_spar_enc_close( &( st_ivas->hSpar ), st_ivas->hEncoderConfig->input_Fs, nchan_inp, 0 );

lib_enc/ivas_ism_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -210,11 +210,19 @@ ivas_error ivas_ism_enc( 
        }



#ifdef DEBUG_MODE_PARAM_ISM

#ifndef PARAM_ISM_REFACTOR

        if ( st_ivas->hDirAC != NULL )

            dbgwrite( &( st_ivas->hDirAC->hParamIsm->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" );

        dbgwrite( &( st_ivas->hISMDTX->dtx_flag ), sizeof( int16_t ), 1, 1, "./res/ParamISM_DTX_CNG_flag_enc.dat" );

        dbgwrite( &( st_ivas->hISMDTX->sce_id_dtx ), sizeof( int16_t ), 1, input_frame, "./res/sce_id_dtx" );

        dbgwrite( &( dtx_flag ), sizeof( int16_t ), 1, input_frame, "./res/dtx_flag" );

#else

        if ( st_ivas->hParamIsmDec != NULL )

            dbgwrite( &( st_ivas->hParamIsmDec->hParamIsm->flag_noisy_speech ), sizeof( int16_t ), 1, 1, "./res/ParamISM_noisy_speech_flag_enc.dat" );

        dbgwrite( &( st_ivas->hISMDTX->dtx_flag ), sizeof( int16_t ), 1, 1, "./res/ParamISM_DTX_CNG_flag_enc.dat" );

        dbgwrite( &( st_ivas->hISMDTX->sce_id_dtx ), sizeof( int16_t ), 1, input_frame, "./res/sce_id_dtx" );

        dbgwrite( &( dtx_flag ), sizeof( int16_t ), 1, input_frame, "./res/dtx_flag" );

#endif

#endif

    }