Commit 898cf3cc authored by bayers's avatar bayers
Browse files

another fix for ISM br switching, clang-format

parent c288c4c2

lib_dec/ivas_ism_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -83,7 +83,13 @@ static ivas_error ivas_ism_bitrate_switching( 
    nSCE_old = st_ivas->nSCE;



#ifdef FIX_416_ISM_BR_SWITCHING

    /* we need to set to the old ism mode here, otherwise we are not getting the correct numbers*/

    {

        ISM_MODE new_ism_mode = st_ivas->ism_mode;

        st_ivas->ism_mode = last_ism_mode;

        ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

        st_ivas->ism_mode = new_ism_mode;

    }

#endif



    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 )

lib_dec/ivas_mc_param_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -1542,7 +1542,6 @@ void ivas_param_mc_dec_digest_tc( 
    pop_wmops();



    return;



}



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