Commit e107fd3b authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix compiler warnings

parent 4135f19b

lib_dec/ivas_osba_dec.c

+2 −64
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ ivas_error ivas_masa_ism_data_open( 
)

{

    MASA_ISM_DATA_HANDLE hMasaIsmData;

    int16_t ch, bin;

    int16_t sf, obj_idx;



    if ( ( hMasaIsmData = (MASA_ISM_DATA_HANDLE) malloc( sizeof( MASA_ISM_DATA ) ) ) == NULL )

    {
@@ -64,40 +62,6 @@ ivas_error ivas_masa_ism_data_open( 
    }

    hMasaIsmData->delayBuffer = NULL;



#if 0

    for ( bin = 0; bin < CLDFB_NO_CHANNELS_MAX; bin++ )

    {

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

        {

            hMasaIsmData->ismPreprocMatrix[ch][ch][bin] = 1.0f;

            hMasaIsmData->ismPreprocMatrix[1 - ch][ch][bin] = 0.0f;

            hMasaIsmData->eneMoveIIR[ch][bin] = 0.0f;

            hMasaIsmData->enePreserveIIR[ch][bin] = 0.0f;

        }

        hMasaIsmData->preprocEneTarget[bin] = 0.0f;

        hMasaIsmData->preprocEneRealized[bin] = 0.0f;

    }



    hMasaIsmData->objectsMoved = 0;



    for ( ch = 0; ch < st_ivas->nchan_ism; ch++ )

    {

        hMasaIsmData->q_elevation_old[ch] = 0.0f;

        hMasaIsmData->q_azimuth_old[ch] = 0.0f;

    }



    for ( obj_idx = 0; obj_idx < MAX_NUM_OBJECTS; obj_idx++ )

    {

        set_s( hMasaIsmData->azimuth_ism[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

        set_s( hMasaIsmData->elevation_ism[obj_idx], 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

        for ( sf = 0; sf < MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR; sf++ )

        {

            set_zero( hMasaIsmData->energy_ratio_ism[obj_idx][sf], CLDFB_NO_CHANNELS_MAX );

        }

    }

    set_s( hMasaIsmData->azimuth_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

    set_s( hMasaIsmData->elevation_separated_ism, 0, MAX_PARAM_SPATIAL_SUBFRAMES + DELAY_MASA_PARAM_DEC_SFR );

#endif

    st_ivas->hMasaIsmData = hMasaIsmData;



    return IVAS_ERR_OK;
@@ -145,10 +109,7 @@ ivas_error ivas_masa_ism_separate_object_renderer_open( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

)

{

    int16_t interpolator_length;

    int16_t i;

    int16_t init_interpolator_length;





    st_ivas->hMasaIsmData->delayBuffer_nchan = st_ivas->nchan_ism;

    st_ivas->hMasaIsmData->delayBuffer_size = (int16_t) ( ( st_ivas->hDecoderConfig->output_Fs / 50 ) / MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -186,7 +147,7 @@ ivas_error ivas_osba_dirac_td_binaural( 
{

    int16_t n;

    float data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];

    float gain = 0.7943f; /* Todo Nokia: Temporary gain for roughly matching the loudness of other processing paths. */



	ivas_error error;

    float *p_sepobj[MAX_NUM_OBJECTS];

#ifdef SBA_AND_OBJECTS
@@ -293,8 +254,6 @@ ivas_error ivas_osba_ism_metadata_dec( 
    int16_t nb_bits_metadata[]           /* o  : number of ISM metadata bits       */

)

{

    int16_t n, block;

    int16_t azimuth_ism, elevation_ism, meta_write_index;

    ivas_error error;



    /* set ISM parameters */
@@ -308,27 +267,6 @@ ivas_error ivas_osba_ism_metadata_dec( 
    {

        return error;

    }

#if 0

    if ( st_ivas->hDirAC != NULL )

    {

        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            for ( n = 0; n < st_ivas->nchan_ism; n++ )

            {

                azimuth_ism = (int16_t) ( st_ivas->hIsmMetaData[n]->azimuth + 0.5f );

                elevation_ism = (int16_t) ( st_ivas->hIsmMetaData[n]->elevation + 0.5f );



                for ( block = 0; block < MAX_PARAM_SPATIAL_SUBFRAMES; block++ )

                {

                    meta_write_index = ( dirac_bs_md_write_idx + block ) % st_ivas->hDirAC->dirac_md_buffer_length;

                    st_ivas->hMasaIsmData->azimuth_ism[n][meta_write_index] = azimuth_ism;

                    st_ivas->hMasaIsmData->elevation_ism[n][meta_write_index] = elevation_ism;

                }

            }

        }

    }

#endif





    return IVAS_ERR_OK;

}