Commit 56d5ea55 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '2225_ref_port_mr2392_wrong_indexing_in_masa_ext_parambin' into 'ivas-float-update' 

[rend-non-BE][split-non-BE] Port float MR 2392 to ivas-float-update in points where it applies.

See merge request !2564
parents d3dba0b5 ec61dd67

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ 
#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */

#define NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL /* Nokia: Adjustments in remaining stereo panning functions to make them BE between Debug and Release */

#define BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL         /* Dolby: Fix coverage of SBA SPAR Dynamic active W not getting hit by the tests */

#define NONBE_FIX_1442_MASA_EXT_REND_ORIENT_IDX         /* Nokia: Fix issue 1442 of wrong index to combinedOrientationData */



// object-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

lib_rend/ivas_dirac_dec_binaural_functions.c

+10 −1
Original line number Diff line number Diff line
@@ -3531,6 +3531,15 @@ static void ivas_masa_ext_rend_parambin_internal( 
                mvr2r( hMasaExtRend->hDiracDecBin[0]->ChCrossRe, hDiracDecBin->ChCrossRe, hSpatParamRendCom->num_freq_bands );

                mvr2r( hMasaExtRend->hDiracDecBin[0]->ChCrossIm, hDiracDecBin->ChCrossIm, hSpatParamRendCom->num_freq_bands );



#ifdef NONBE_FIX_1442_MASA_EXT_REND_ORIENT_IDX

                ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat_local, subframe,

                                                                              hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0,

                                                                              subFrameTotalEne, IIReneLimiter, NULL );



                ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_local, subframe,

                                                                       hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[hCombinedOrientationData->subframe_idx] > 0,

                                                                       0, NULL );

#else

                ivas_dirac_dec_binaural_formulate_target_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat_local, subframe,

                                                                              hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,

                                                                              subFrameTotalEne, IIReneLimiter, NULL );
@@ -3538,7 +3547,7 @@ static void ivas_masa_ext_rend_parambin_internal( 
                ivas_dirac_dec_binaural_determine_processing_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_local, subframe,

                                                                       hCombinedOrientationData && hCombinedOrientationData->enableCombinedOrientation[subframe] > 0,

                                                                       0, NULL );



#endif



                /* re-use reverb and decorr from main direction for the sides */

                ivas_dirac_dec_binaural_process_output( hDiracDecBin, hSpatParamRendCom, hMasaExtRend->cldfbSynRend, output_f, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in,