Commit e154b62b authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 744_step4_hrtf_binary_tests

parents a225806a 6ce78b80

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural reverb*/

#define FIX_20_MS_FRAME_LEN_TABLES_CONVERTER            /* Orange : generate_tables_converter tools can generate rom for 5 and 20 ms frame length */

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

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */



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

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1138,6 +1138,7 @@ ivas_error ivas_jbm_dec_render( 
        }

        else if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifndef FIX_959_MASA_LINEAR_REND

            if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC )

            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -1152,6 +1153,9 @@ ivas_error ivas_jbm_dec_render( 
                }

            }

            else if ( st_ivas->renderer_type == RENDERER_DIRAC )

#else

            if ( st_ivas->renderer_type == RENDERER_DIRAC )

#endif

            {

                ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

            }

lib_dec/ivas_output_config.c

+4 −0
Original line number Diff line number Diff line
@@ -371,7 +371,11 @@ void ivas_renderer_select( 
            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

            }

#ifdef FIX_959_MASA_LINEAR_REND

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

#else

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

#endif

        }

        else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||

                  ( ivas_format == SBA_FORMAT && ( output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_MONO ) ) )