Commit 7928f488 authored by vaclav's avatar vaclav
Browse files

port FIX_955_FASTCONV_REND_IN_ISM

parent 2e715f2e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+12 −2
Original line number Diff line number Diff line
@@ -2038,9 +2038,19 @@ ivas_error ivas_jbm_dec_render_fx( 
            {

                ivas_apply_non_diegetic_panning_fx( p_output_fx, st_ivas->hDecoderConfig->non_diegetic_pan_gain_fx, *nSamplesRendered );

            }

#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )

#else

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) )

#endif

            {

                /* Convert to Ambisonics */

#else

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_ENC ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) )

            {

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

#endif

#ifdef MSAN_FIX

                FOR( i = 0; i < st_ivas->nchan_transport; i++ )

                {