Commit 26340949 authored by vaclav's avatar vaclav
Browse files

formatting

parent 0d80b2a2

lib_dec/ivas_ism_param_dec.c

+65 −68
Original line number Diff line number Diff line
@@ -1004,7 +1004,6 @@ void ivas_param_ism_params_to_masa_param_mapping( 
}







#ifdef ISM_BITRATE_SWITCHING

static ivas_error ivas_ism_format_bitrate_switching(

    Decoder_Struct *st_ivas,        /* i/o: IVAS decoder structure              */
@@ -1054,7 +1053,6 @@ static ivas_error ivas_ism_format_bitrate_switching( 
            destroy_sce_dec( st_ivas->hSCE[sce_id] );

            st_ivas->hSCE[sce_id] = NULL;

        }



    }



    /* destroy the memory of hp20*/
@@ -1197,7 +1195,6 @@ static ivas_error ivas_ism_format_bitrate_switching( 
                st_ivas->hHrtf = NULL;

            }

        }



    }



    return error;
@@ -1257,7 +1254,7 @@ ivas_error ivas_ism_dec_config( 
        if ( st_ivas->ini_active_frame != 0 )

        {

#ifdef ISM_BITRATE_SWITCHING

            /* ISM format/bitrate switching */

            /* ISM bit-rate switching */

            if ( ( st_ivas->hDecoderConfig->last_ivas_total_brate != IVAS_SID_5k2 ) && ( st_ivas->hDecoderConfig->last_ivas_total_brate != FRAME_NO_DATA ) )

            {

                if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hDecoderConfig->ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate ) )

lib_enc/ivas_ism_param_enc.c

+38 −39
Original line number Diff line number Diff line
@@ -431,12 +431,11 @@ ivas_error ivas_ism_enc_config( 
    st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->hEncoderConfig->nchan_inp, st_ivas->hEncoderConfig->ivas_total_brate );



#ifdef ISM_BITRATE_SWITCHING

    /* ISM format switching */

    /* ISM  bit-rate switching */

    if ( ( st_ivas->ism_mode != last_ism_mode ) || ( st_ivas->hEncoderConfig->ivas_total_brate != st_ivas->hEncoderConfig->last_ivas_total_brate ) )

    {

        int32_t element_brate_tmp[MAX_NUM_OBJECTS];

        Indice *ind_list_sce;    /* list of indices */

        Indice *ind_list_metadata;    /* list of indices */

        Indice *ind_list_sce, *ind_list_metadata;



        /* Reset and Initialize */

        if ( st_ivas->ism_mode == ISM_MODE_PARAM )