Commit 494a65f4 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1878_basop_port_mr_1770_mcmasa_indexing_bug' into 'main' 

[non-BE] [allow regression] Port float MR1770 to BASOP

See merge request !2015
parents 8a98aad7 0954edc2

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART             /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */



/* #################### End BASOP porting switches ############################ */

lib_enc/ivas_masa_enc_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -2667,11 +2667,16 @@ static void reduce_metadata_further_fx( 
                /* Copy spread coherence to the rest of subframes for the coherence coding algorithm. */

                FOR( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )

                {

#ifdef NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR

                    hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0

                    move16();

#else

                    FOR( band = 0; band < numCodingBands; band++ )

                    {

                        hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0]; // Q0

                        move16();

                    }

#endif

                }



                /* Surround coherence is already merged through time */