Commit e49d7dd0 authored by norvell's avatar norvell
Browse files

Cleanup and clang format

parent 83da813d

lib_dec/ivas_ism_dec.c

+3 −5
Original line number Diff line number Diff line
@@ -72,13 +72,11 @@ static ivas_error ivas_ism_bitrate_switching( 
    st_ivas->ism_mode = ism_mode;

#endif



    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL,

#ifdef ISM_NON_DIEGETIC_PAN

                                    0,

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#else

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#endif

                                    NULL,



                                    NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

    {

        return error;

    }

lib_enc/ivas_ism_enc.c

+3 −4
Original line number Diff line number Diff line
@@ -402,12 +402,11 @@ ivas_error ivas_ism_enc_config( 
        st_ivas->nSCE = st_ivas->nchan_transport;

        st_ivas->nCPE = 0;



        if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL,

#ifdef ISM_NON_DIEGETIC_PAN

                                        0,

        if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#else

        if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#endif

                                        NULL,

                                        NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

        {

            return error;

        }

lib_rend/lib_rend.c

+2 −0
Original line number Diff line number Diff line
@@ -3821,7 +3821,9 @@ int16_t IVAS_REND_FeedRenderConfig( 
    mvr2r( renderConfig.room_acoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( renderConfig.room_acoustics.pAcoustic_rt60, hRenderConfig->roomAcoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( renderConfig.room_acoustics.pAcoustic_dsr, hRenderConfig->roomAcoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

#ifdef ISM_NON_DIEGETIC_PAN

    mvr2r( renderConfig.directivity, hRenderConfig->directivity, 3 );

#endif



    return IVAS_ERR_OK;

}

lib_util/ism_file_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ivas_error IsmFileWriter_open( 


    strncpy( metadata_filename_loc, filePathWav, sizeof( metadata_filename_loc ) - 1 );

    snprintf( ext_meta, sizeof( ext_meta ), ".%d.csv", obj_num );

    const int32_t maxNumCharactersToAppend = (int32_t) ( sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1 );

    const int32_t maxNumCharactersToAppend = (int32_t) sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1;

    strncat( metadata_filename_loc, ext_meta, maxNumCharactersToAppend );



    strcpy( filePath, metadata_filename_loc );

lib_dec/ivas_ism_metadata_dec.c

+460 −460

File changed.

Contains only whitespace changes.

lib_dec/ivas_stat_dec.h

+31 −31

File changed.

Contains only whitespace changes.

lib_enc/ivas_ism_metadata_enc.c

+23 −23

File changed.

Contains only whitespace changes.

lib_com/fine_gain_bits.c

+3 −3

File changed.

Contains only whitespace changes.

lib_dec/lib_dec.c

+3 −3

File changed.

Contains only whitespace changes.

lib_enc/lib_enc.c

+1 −1

File changed.

Contains only whitespace changes.

lib_util/ism_file_reader.c

+2 −2

File changed.

Contains only whitespace changes.

lib_com/hq_tools.c

+2 −2

File changed.

Contains only whitespace changes.

lib_com/ivas_ism_com.c

+1 −1

File changed.

Contains only whitespace changes.

lib_debug/snr.c

+3 −3

File changed.

Contains only whitespace changes.