Commit 2f6a3c88 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge errors

parent 93579812

lib_dec/ivas_sba_dec.c

+1 −10
Original line number Diff line number Diff line
@@ -258,9 +258,7 @@ ivas_error ivas_sba_dec_reconfigure( 
#endif



    /* save old */

#ifdef JBM_FOR_OSBA

    if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL )

#endif

    {

        if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL ) // ToDo; this never happens

        {
@@ -693,7 +691,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            }

#endif

        }

        else /* :TODO: looks obsolete, needs to be checked */

        else

        {

            if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirACRend->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) ) )

            {
@@ -707,13 +705,6 @@ ivas_error ivas_sba_dec_reconfigure( 
#endif

        )

        {

#if 0

            if ( !st_ivas->hDecoderConfig->Opt_5ms )

            {

                tc_nchan_tc = 0;

                tc_nchan_to_allocate = 0;

            }

#endif

            if ( ( error = ivas_jbm_dec_tc_buffer_reconfigure( st_ivas, tc_buffer_mode, tc_nchan_tc, tc_nchan_to_allocate, tc_nchan_to_allocate,

#ifdef JBM_FOR_OSBA

                                                               granularity_new