Commit 3b023dd0 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1552_ref_sba_msan_fix' into 'float-pc' 

[non-BE]Port 1298 from float to float-pc

See merge request !1524
parents f34818ef 9c12fb8b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ 
#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

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

lib_dec/ivas_output_config.c

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

            *internal_config = IVAS_AUDIO_CONFIG_HOA3;



#ifdef NONBE_FIX_935_SBA_REVERB

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -194,7 +194,11 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else

        {

#ifdef NONBE_FIX_935_SBA_REVERB

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_spar_decoder.c

+7 −1
Original line number Diff line number Diff line
@@ -249,7 +249,13 @@ ivas_error ivas_spar_dec_open( 
            nchan_to_allocate = 2 * BINAURAL_CHANNELS;

        }



        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT &&

#ifdef NONBE_FIX_935_SBA_REVERB

             st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL &&

#else

             ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) &&

#endif

             st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            /* get correct granularity in case of binaural rendering of the discrete objects with the td obj renderer */

            granularity = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );