Commit 7e47f0bd authored by vaclav's avatar vaclav
Browse files

issue 966: put FastConv rendering call under DEBUGGING; under FIX_955_FASTCONV_REND_IN_ISM

parent 443d8047

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange: Missing left/right and coherence late reverb tables in binary format*/

#define FIX_OLD_BINARY_FORMAT                           /* Orange: temporary to maintain bitexactness */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */



/* #################### End BE switches ################################## */

lib_dec/ivas_jbm_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -1060,11 +1060,23 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }

#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

            {

                /* Convert to Ambisonics */

                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 );

            }

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

                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



            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )