Commit ee65a194 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1165-static-scaling-for-downmixes' of... 

Merge branch '1165-static-scaling-for-downmixes' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 1165-static-scaling-for-downmixes
parents 5c3b1dde 1b9a88a8

lib_dec/ivas_masa_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -452,6 +452,9 @@ ivas_error ivas_masa_decode( 
    }

    else if ( !st->bfi && ivas_format == MASA_FORMAT && ivas_total_brate == IVAS_SID_5k2 )

    {

#ifdef NONBE_FIX_1165_STATIC_SCAL_OMASA

        hMasa->config.input_ivas_format = MASA_FORMAT; /* Default in SID as OMASA does not support SID */

#endif

        if ( hQMetaData->q_direction == NULL )

        {

            /* replicate ivas_masa_dec_config() in case that first good received frame is SID frame */

lib_enc/ivas_enc.c

+7 −1
Original line number Diff line number Diff line
@@ -318,12 +318,18 @@ 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, input_frame, BER_detect_dummy );

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

#endif

        }