Commit 19736c7f authored by vaclav's avatar vaclav
Browse files

fix for ISM to FOA in JBM; within UNIFIED_DECODING_PATHS_LEFTOVERS

parent 90d1247e

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1095,7 +1095,7 @@ ivas_error ivas_jbm_dec_render( 
            {

                /* Convert to Ambisonics */

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

                ivas_ism2sba_sf( p_tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, 0, st_ivas->hIntSetup.ambisonics_order );

                ivas_ism2sba_sf( p_tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

#else

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

#endif

lib_dec/ivas_sba_rendering_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -376,7 +376,11 @@ void ivas_ism2sba_sf( 
        for ( j = 0; j < sba_num_chans; j++ )

        {

            g2 = hIsmRendererData->interpolator + offset;

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

            tc = buffer_in[i];

#else

            tc = buffer_in[i] + offset;

#endif

            out = buffer_tmp[j];

            gain = hIsmRendererData->gains[i][j];

            prev_gain = hIsmRendererData->prev_gains[i][j];