Commit c1597d2c authored by lintervo's avatar lintervo
Browse files

Add missing changes

parent 49eefe2e

lib_dec/ivas_omasa_dec_fx.c

+9 −1
Original line number Diff line number Diff line
@@ -1120,10 +1120,14 @@ void ivas_omasa_dirac_rend_jbm_fx( 
        {

            Copy32( &output_fx[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );



#ifdef NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES

            IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )

#else

#ifdef FIX_1330_JBM_MEMORY

            IF( !st_ivas->hDecoderConfig->Opt_tsm && EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )

#else

        IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )

#endif

#endif

            {

                /* Gain separated object, if edited */
@@ -1145,10 +1149,14 @@ void ivas_omasa_dirac_rend_jbm_fx( 
                Copy32( &output_fx[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );



                /* Gain discrete objects, if edited */

#ifdef NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES

                IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )

#else

#ifdef FIX_1330_JBM_MEMORY

                IF( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->ism_gain_is_edited[n] )

#else

            IF( st_ivas->hMasaIsmData->ism_gain_is_edited[n] )

#endif

#endif

                {

                    v_multc_fx_16( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited_fx[n], data_separated_objects[n], *nSamplesRendered ); // Q = 8
@@ -1156,7 +1164,7 @@ void ivas_omasa_dirac_rend_jbm_fx( 
                }

            }



            /* Gain MASA part, if edited */

            /* Gain MASA part, if edited in G192. MASA gaining with VOIP is done in ivas_dec_prepare_renderer() */

#ifdef FIX_1330_JBM_MEMORY

            IF( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->masa_gain_is_edited )

#else