Commit 89387805 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Port float MR1770 to BASOP

parent 70ac6cfe

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
#define NONBE_FIX_MC_LFE_LPF                                  /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define FIX_1222_OMASA_DEC_CHANNEL_BUFFERS              /* VA: issue 1222: Reduction of the number of channel buffers in OMASA decoder */

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