Commit 974ae883 authored by lintervo's avatar lintervo
Browse files

Add missing changes

parent a2558835

lib_dec/ivas_omasa_dec.c

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

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



#ifdef NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES

            if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#else

#ifdef FIX_1330_JBM_MEMORY

            if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#else

        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#endif

#endif

            {

                /* Gain separated object, if edited */
@@ -719,17 +723,21 @@ void ivas_omasa_dirac_rend_jbm( 
                mvr2r( &output_f[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( data_separated_objects[n], st_ivas->hMasaIsmData->gain_ism_edited[n], data_separated_objects[n], *nSamplesRendered );

                }

            }



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