Commit fe6c4bd9 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1441-rtp-restart-functionality-breaks-split-rendering-with-rtp-input
parents d1a6d437 6a06b484

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ 
#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 FIX_GAIN_EDIT_LIMITS                           /* Harmonize gain edit limits for all opertation points. For all modes, limit to max +12dB. For parametric modes, limit to min -24dB. */

#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 */



#define FIX_1430_EVS_STEREO_DMX_CHANNEL_DISAPPEARING    /* Orange: Fix for basop issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */

#define FIX_1440_AMR_WB_RESET                           /* VA: issue 1440: Fix missing AMR-WB IO memory reset (applicable to float only) */

lib_rend/ivas_dirac_dec_binaural_functions.c

+16 −3
Original line number Diff line number Diff line
@@ -3441,11 +3441,15 @@ static void ivas_masa_ext_rend_parambin_internal( 


    ivas_dirac_dec_binaural_formulate_input_covariance_matrices( hDiracDecBin, hSpatParamRendCom, &config_data, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, subframe,

                                                                 subFrameTotalEne, IIReneLimiter );



#ifdef NONBE_FIX_1442_MASA_EXT_REND_ORIENT_IDX

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

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

                                                                  subFrameTotalEne, IIReneLimiter, NULL );

#else

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

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

                                                                  subFrameTotalEne, IIReneLimiter, NULL );



#endif

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

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

                                                           0, NULL );
@@ -3509,6 +3513,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 );
@@ -3516,7 +3529,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,