Commit a6538a20 authored by vaclav's avatar vaclav
Browse files

fix merge

parent bebb3317

lib_dec/ivas_mct_dec.c

+10 −2
Original line number Diff line number Diff line
@@ -1310,7 +1310,6 @@ static ivas_error ivas_mc_dec_reconfig( 


    int16_t tc_nchan_full_new;

    DECODER_TC_BUFFER_HANDLE hTcBuffer;

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );



    hTcBuffer = st_ivas->hTcBuffer;

    tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );
@@ -1319,8 +1318,17 @@ static ivas_error ivas_mc_dec_reconfig( 
    tc_nchan_full_new = tc_nchan_tc_new;



    if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

    {

        tc_nchan_allocate_new = BINAURAL_CHANNELS;

        if ( st_ivas->hDiracDecBin[0] != NULL && st_ivas->hDiracDecBin[0]->useTdDecorr )

        {

            tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;

        }

        else if ( st_ivas->hOutSetup.separateChannelEnabled )

        {

            tc_nchan_allocate_new++;

        }



        tc_nchan_full_new = tc_nchan_allocate_new;

    }