Commit edcd2e30 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Formatting and fixes to instrumented build and sanitizer.

parent 6d7aa532

lib_dec/ivas_dirac_dec.c

+37 −44
Original line number Diff line number Diff line
@@ -279,8 +279,7 @@ static ivas_error ivas_dirac_dec_config_internal( 
static ivas_error ivas_dirac_rend_config(

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

    const DIRAC_CONFIG_FLAG flag_config_inp, /* i/ : Flag determining if we open or reconfigure the DirAC decoder */

    const int16_t dec_param_estim_old

)

    const int16_t dec_param_estim_old )

{

    DIRAC_DEC_HANDLE hDirAC;

    int16_t nchan_out_woLFE;
@@ -1267,8 +1266,7 @@ ivas_error ivas_dirac_dec_config( 
 *------------------------------------------------------------------------*/



void ivas_dirac_dec_close(

    DIRAC_DEC_HANDLE *hDirAC_out

)

    DIRAC_DEC_HANDLE *hDirAC_out )

{

    DIRAC_DEC_HANDLE hDirAC;
@@ -1293,8 +1291,7 @@ void ivas_dirac_dec_close( 
}



void ivas_spat_rend_common_data_close(

    SPAT_PARAM_REND_COMMON_DATA_HANDLE *rend_common_data_out

)

    SPAT_PARAM_REND_COMMON_DATA_HANDLE *rend_common_data_out )

{

    if ( rend_common_data_out == NULL || *rend_common_data_out == NULL )

    {
@@ -1308,12 +1305,10 @@ void ivas_spat_rend_common_data_close( 
    *rend_common_data_out = NULL;



    return;



}



void ivas_dirac_rend_close(

    DIRAC_REND_HANDLE *hDirACRend_out

)

    DIRAC_REND_HANDLE *hDirACRend_out )

{

    int16_t i, j;

    DIRAC_REND_HANDLE hDirACRend;
@@ -1409,7 +1404,6 @@ void ivas_dirac_rend_close( 
}







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

 * ivas_dirac_deallocate_parameters()

 *
@@ -1422,13 +1416,14 @@ void ivas_dirac_deallocate_parameters( 
)

{

    int16_t i;

    int16_t md_buffer_length;



    if ( rend_common_data == NULL )

    {

        return;

    }



    int16_t md_buffer_length = rend_common_data->dirac_md_buffer_length;

    md_buffer_length = rend_common_data->dirac_md_buffer_length;



    if ( params_flag == 1 )

    {
@@ -2502,16 +2497,14 @@ void ivas_dirac_dec_render( 
{

    int16_t slots_to_render, first_sf, last_sf, subframe_idx;

    uint16_t slot_size, n_samples_sf, ch, nchan_intern;

    DIRAC_DEC_HANDLE hDirAC;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE rend_common_data;

    float *output_f_local[MAX_OUTPUT_CHANNELS];



    hDirAC = st_ivas->hDirAC;

    rend_common_data = st_ivas->rend_common_data;



    nchan_intern = st_ivas->hIntSetup.nchan_out_woLFE + st_ivas->hIntSetup.num_lfe;

#ifdef DEBUGGING

    assert( hDirAC );

    assert( rend_common_data );

#endif

    for ( ch = 0; ch < nchan_intern; ch++ )

    {

lib_dec/ivas_dirac_output_synthesis_dec.c

100755 → 100644
+22 −22

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_dec/ivas_masa_dec.c

+5 −4
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ ivas_error ivas_masa_dec_reconfigure( 
        {

            st_ivas->hCPE[cpe_id]->nchan_out = CPE_CHANNELS;



            if ( (st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL) || ((st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM) && st_ivas->hDiracDecBin != NULL) )            {

            if ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend != NULL ) || ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) && st_ivas->hDiracDecBin != NULL ) )

            {

                if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE ) ) != IVAS_ERR_OK )

                {

                    return error;

lib_rend/lib_rend.c

+6 −1
Original line number Diff line number Diff line
@@ -2594,6 +2594,8 @@ static DecoderDummy *initDecoderDummy( 
    decDummy->hVBAPdata = NULL; // note: not used at the moment

    decDummy->hMasa = NULL;

    decDummy->hDiracDecBin = NULL;

    decDummy->hDirACRend = NULL;

    decDummy->rend_common_data = NULL;

    decDummy->hQMetaData = NULL;

    decDummy->hHrtfParambin = NULL;

    decDummy->hHeadTrackData = NULL;
@@ -2787,6 +2789,9 @@ static void freeDecoderDummy( 
        pDecDummy->hoa_dec_mtx = NULL;

    }



    /* Parametric binaural renderer HRTF structure */

    free( pDecDummy->hHrtfParambin );



    /* Parametric binaural renderer handle */

    ivas_dirac_dec_close_binaural_data( &pDecDummy->hDiracDecBin );

lib_dec/ivas_init_dec.c

+2 −2

File changed.

Contains only whitespace changes.

lib_dec/ivas_ism_dec.c

+1 −1

File changed.

Contains only whitespace changes.

lib_dec/ivas_ism_param_dec.c

+4 −4

File changed.

Contains only whitespace changes.

lib_rend/ivas_dirac_dec_binaural_functions.c

+2 −2

File changed.

Contains only whitespace changes.