Commit 5fb1890d authored by bayers's avatar bayers
Browse files

fix JBM MASA BR switching

parent f0ee4c37

lib_dec/ivas_masa_dec.c

+5 −3
Original line number Diff line number Diff line
@@ -1254,20 +1254,22 @@ ivas_error ivas_masa_dec_reconfigure( 
    ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp );



#ifdef JBM_TSM_ON_TCS

    if ( st_ivas->hDecoderConfig->voip_active == 1 && st_ivas->renderer_type != RENDERER_DISABLE )

    if ( st_ivas->hDecoderConfig->voip_active == 1 )

    {

        int16_t tc_nchan_to_allocate;

        int16_t tc_nchan_transport;

        TC_BUFFER_MODE buffer_mode_new;



        buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );

        tc_nchan_transport = ivas_jbm_dec_get_num_tc_channels( st_ivas );

        tc_nchan_to_allocate = tc_nchan_transport;

        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_to_allocate = 2 * BINAURAL_CHANNELS;

        }

        if ( tc_nchan_transport != st_ivas->hTcBuffer->nchan_transport_jbm || tc_nchan_to_allocate != st_ivas->hTcBuffer->nchan_transport_internal )

        if ( tc_nchan_transport != st_ivas->hTcBuffer->nchan_transport_jbm || tc_nchan_to_allocate != st_ivas->hTcBuffer->nchan_transport_internal || buffer_mode_new != st_ivas->hTcBuffer->tc_buffer_mode )

        {

            if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, TC_BUFFER_MODE_RENDERER, tc_nchan_transport, tc_nchan_to_allocate, tc_nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, buffer_mode_new, tc_nchan_transport, tc_nchan_to_allocate, tc_nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

            {

                return error;

            }