Commit 0e93370c authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Revert application of limiter on separated object in OMASA.

parent ee65a194

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 




#define NONBE_FIX_1165_STATIC_SCAL_PARAMMC              /* FhG: add static scaling to ParamMC DMX */

/*#define NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX*/     /* FhG: apply the limiter before the core encoder for formats with downmixing where the signal could exceed the 16-bit value range */

#define NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX     /* FhG: apply the limiter before the core encoder for formats with downmixing where the signal could exceed the 16-bit value range */

#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_enc.c

+1 −7
Original line number Diff line number Diff line
@@ -318,18 +318,12 @@ ivas_error ivas_enc( 
        /* put audio object data in SCE's */

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )

        {

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            int16_t num_sep_obj;



            num_sep_obj = ( st_ivas->ism_mode == ISM_MODE_NONE ) ? 0 : 1;



#endif

            /* Estimate MASA parameters for the objects */

            ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object, &idx_separated_object );

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX



            /* Apply limiter on downmix */

            ivas_limiter_apply( st_ivas->hLimiter, &data_f[st_ivas->hEncoderConfig->nchan_ism], CPE_CHANNELS + num_sep_obj, input_frame, BER_detect_dummy );

            ivas_limiter_apply( st_ivas->hLimiter, &data_f[st_ivas->hEncoderConfig->nchan_ism], CPE_CHANNELS, input_frame, BER_detect_dummy );

#endif

        }