Commit 456733ef authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2496-omasa-object-editing-path-has-wrong-assignment' into 'main' 

[non-BE] Resolve "OMASA object editing path has wrong assignment"

Closes #2496

See merge request !2914
parents a808be0a 51e45443

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
#define FIX_1562_DTX_CRASH_DECODER                      /* VA: float issue 1562: fix crash in stereo decoding in DTX and bitrate switching */

#define FIX_BASOP_2498_LOGIC_IN_ENC_DTX_DECISION_MTX    /* Nokia: BASOP 2498: Fix the logic */

#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */



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

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -5956,7 +5956,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                ELSE

                {

                    newRatios[0] = L_shr( newRatios[0], 6 ); // Q = 30 + 9 + 1 - 16 = 24

#ifdef FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN

                    newRatios[1] = L_shr( newRatios[1], 6 );

#else

                    newRatios[1] = L_shr( newRatios[0], 6 );

#endif

                    move32();

                    move32();

                }