Commit 597dfdcd authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '2225_basop_port_mr2392_wrong_indexing_in_masa_ext_parambin' into 'main' 

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

See merge request !2566
parents 3a3a2ce7 cb50b5e4

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define FIX_1437_LC3PLUS_EXTREND_HIRES                  /* FhG: fix external renderer split bitstream header writing causing a crash for LC3plus High-res mode */

#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV               /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */

#define FIX_1318_ROOM_SIZE_CMD_LINE                     /* Philips/Nokia/FhG: Default room sizes support */

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



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+10 −1
Original line number Diff line number Diff line
@@ -6744,6 +6744,15 @@ static void ivas_masa_ext_rend_parambin_internal_fx( 
                Copy( hMasaExtRend->hDiracDecBin[0]->ChCrossRe_e, hDiracDecBin->ChCrossRe_e, hSpatParamRendCom->num_freq_bands );

                Copy( hMasaExtRend->hDiracDecBin[0]->ChCrossIm_e, hDiracDecBin->ChCrossIm_e, hSpatParamRendCom->num_freq_bands );



#ifdef NONBE_FIX_1442_MASA_EXT_REND_ORIENT_IDX

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

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

                                                                                 subFrameTotalEne_fx, subFrameTotalEne_e, IIReneLimiter_fx, NULL );



                ivas_dirac_dec_binaural_determine_processing_matrices_fx( 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_fx( hDiracDecBin, hSpatParamRendCom, &config_data, Rmat_local, subframe,

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

                                                                                 subFrameTotalEne_fx, subFrameTotalEne_e, IIReneLimiter_fx, NULL );
@@ -6751,7 +6760,7 @@ static void ivas_masa_ext_rend_parambin_internal_fx( 
                ivas_dirac_dec_binaural_determine_processing_matrices_fx( hDiracDecBin, hSpatParamRendCom, &config_data, max_band_decorr, Rmat_local, subframe,

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

                                                                          0, NULL );



#endif



                q_mat = hDiracDecBin->q_processMtx;

                move16();