Commit 8841bf34 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into 871-crash-in-osba-encder-with-ltv-signal

parents 40113398 bbbec97e

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -3792,11 +3792,7 @@ static void printSupportedAudioConfigs( void ) 
        "HOA2",

        "HOA3",

        "ISMx (input only)",

#ifdef FIX_740_MASA_PREREND_VALIDITY_CHECK

        "MASAx",

#else

        "MASAx (input only)",

#endif

        "BINAURAL (output only)",

#ifdef SPLIT_REND_WITH_HEAD_ROT

        "BINAURAL_SPLIT_PCM",

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */

#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */

#define FIX_865_MOVE_TD_DECORR                          /* VA: issue 865: Move ivas_td_decorr.c from lib_com to lib_rend */

#define FIX_888_INTERFACE_UNIFICATION                   /* Nokia: issue #888: fix mismatch in 2D array size */

#define FIX_889_MASA_FILE_WRITER_OPEN                   /* Nokia: issue #889: mismatch in function definition and use */
@@ -167,7 +165,6 @@ 


#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_836_PARAMUPMIX_HEADROT                      /* Dlb: issue #836: Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output" */

#define NONBE_FIX_874_OMASA_BRSW_2TD                          /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

lib_dec/ivas_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -868,23 +868,15 @@ ivas_error ivas_dec( 


            ivas_mc_paramupmix_dec( st_ivas, p_output );



#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( st_ivas->transport_config != st_ivas->intern_config &&

                 ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) &&

                 ( output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_HOA3 ) )

#else

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )

#endif

            {

                ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

            }



            /* Rendering */

#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )

#else

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

                if ( output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1810,11 +1810,7 @@ void ivas_dirac_dec_render_sf( 
    DirAC_mem = hDirACRend->stack_mem;



    reference_power = DirAC_mem.reference_power;

#ifdef FIX_879_USAN_ERROR_IN_MASA_DECODING

    reference_power_smooth = ( DirAC_mem.reference_power == NULL ) ? NULL : DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#else

    reference_power_smooth = DirAC_mem.reference_power + hSpatParamRendCom->num_freq_bands;

#endif

    onset_filter = DirAC_mem.onset_filter;

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hSpatParamRendCom->num_freq_bands;

lib_dec/ivas_jbm_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -1356,19 +1356,9 @@ ivas_error ivas_jbm_dec_render( 
        {

            ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc, p_output );



#ifndef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )

            {

                ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

            }

#endif



            /* Rendering */

#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )

#else

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

                /*handled in CLDFB domain already*/