diff --git a/apps/renderer.c b/apps/renderer.c index 62fdcebd9b2d754e7fb94a4257a0566911f683a4..f670bc2abe5f55e468285f93b7b54fa619fdd77b 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -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", diff --git a/lib_com/options.h b/lib_com/options.h index 6da0523307324ebdfd767a67b65ce81d08419074..05bd618b72312a4dc7992cff263004565ea01a39 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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*/ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c index 7ba45259f60606384a2cac5a9d359d093f0fd5e9..04a0cf6b200ade2d6a987de79d766421a9c3d94b 100644 --- a/lib_dec/ivas_dec.c +++ b/lib_dec/ivas_dec.c @@ -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 ) diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index fb8ab22a050e38ddef801b3f99d5adfc063fbb28..4de8d38aaa6bd135b8e9b36f92913612b56f1783 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -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; diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 3e7bb68a546b962e663cc3ffb71aafbc95a85486..9229336f785a60170033cb0329044ae86bab62f8 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -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*/ diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index e4295c1c78f673e0f091ed065e8097cf2ec6b48f..a64bdf33b2e966803bf8a4dfd802b05c97fb3e3a 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -569,10 +569,8 @@ static ivas_error validateOutputAudioConfig( #endif case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR: case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB: -#ifdef FIX_740_MASA_PREREND_VALIDITY_CHECK case IVAS_AUDIO_CONFIG_MASA1: case IVAS_AUDIO_CONFIG_MASA2: -#endif return IVAS_ERR_OK; default: break;