Commit 65c920be authored by norvell's avatar norvell
Browse files

Merge branch '1696_basop_FlpPort1355' into 'main-pc' 

[Non-BE] 1696 basop flp port1355

See merge request !1626
parents 868d9c15 bdcf9e0d

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#endif     

#define NONBE_FIX_978_MC_TDREND_REVERB                  /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2272,7 +2272,11 @@ ivas_error ivas_init_decoder_fx( 
            move16();

        }



#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

            {

lib_dec/ivas_ism_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -218,7 +218,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                {

                    return error;

                }

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

                IF( EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

                IF( EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

                {

                    IF( NE_32( ( error = ivas_reverb_open_fx( &st_ivas->hReverb, st_ivas->hDecoderConfig->output_config, NULL, st_ivas->hBinRendererTd->HrFiltSet_p->lr_energy_and_iac_fx, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ), IVAS_ERR_OK ) )

                    {

lib_dec/ivas_objectRenderer_internal_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -237,7 +237,11 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
        }



        test();

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            FOR( i = 0; i < nchan_ism_internal; ++i )

            {
@@ -269,7 +273,11 @@ ivas_error ivas_td_binaural_renderer_sf_fx( 
        }



        test();

#ifdef NONBE_FIX_978_MC_TDREND_REVERB

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hOutSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#else

        IF( st_ivas->hRenderConfig != NULL && EQ_32( st_ivas->hIntSetup.output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

#endif

        {

            /* add reverb to rendered signals */

            v_add_32( reverb_signal_fx[0], output_fx_local[0], output_fx_local[0], output_frame ); // Q11