Commit 28ce1f37 authored by Jan Kiene's avatar Jan Kiene
Browse files

port 1298 from float

parent 4b4f6041

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#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 */



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

lib_dec/ivas_output_config_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -158,11 +158,19 @@ void ivas_renderer_select( 
            move16();



            test();

#ifdef NONBE_FIX_935_SBA_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) )

#endif

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

#endif /* NONBE_FIX_935_SBA_REVERB */

            {

                *renderer_type = RENDERER_BINAURAL_FASTCONV;

                move16();

lib_dec/ivas_sba_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -216,11 +216,19 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
        ELSE

        {

            test();

#ifdef NONBE_FIX_935_SBA_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) )

#endif

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#else

            IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

#endif /* NONBE_FIX_935_SBA_REVERB */

            {

                renderer_type_new = RENDERER_BINAURAL_FASTCONV;

                move16();

lib_dec/ivas_spar_decoder_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -294,8 +294,14 @@ ivas_error ivas_spar_dec_open_fx( 


        test();

        test();

#ifdef NONBE_FIX_935_SBA_REVERB



        IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )

#else

        test();



        IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && ( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )

#endif

        {

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

            Word32 quo, rem;