Commit f344a5ab authored by lintervo's avatar lintervo
Browse files

Merge branch '2148_obj_edit_issue_with_osba' into 'main' 

[non-BE][allow regression] Fix obj editing with OSBA

See merge request !2523
parents 3258ffd8 9b87c42a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#define FIX_1947_DEC_HIGH_MLD_FOR_STEREO2MONO                /* FhG: Make Q-factor of synth_16_fx and output_16_fx dynamic to prevent overflow in HQ_CORE mode */



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

#define FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA                    /* Nokia: Add missing code to solve issue */

/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */

lib_dec/lib_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4033,6 +4033,10 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
                    move32();

                    hIsmMetaData[obj]->edited_radius_fx = hIsmMetaData[obj]->radius_fx;

                    move32();

#ifdef FIX_2148_OBJ_EDIT_ISSUE_WITH_OSBA

                    hIsmMetaData[obj]->edited_gain_fx = ONE_IN_Q29;

                    move32();

#endif

                }



                if ( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )