Commit 7f1eeab7 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1174-indexing-bug-in-masa-mcmasa-function-reduce_metadata_further' into 'main' 

[non-BE] Resolve "Indexing bug in MASA/McMASA function reduce_metadata_further"

See merge request !1770
parents 92b483e5 e087cfd8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ 


#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN                     /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

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



/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_masa_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1777,10 +1777,14 @@ static void reduce_metadata_further( 
                /* 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];

#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];

                    }

#endif

                }



                /* Surround coherence is already merged through time */