Commit c861f016 authored by Jan Kiene's avatar Jan Kiene
Browse files

add limiter for paramISM

parent 449148c7

lib_enc/ivas_enc.c

+16 −3
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ ivas_error ivas_enc( 
    float *data_f[MAX_INPUT_CHANNELS + MAX_NUM_OBJECTS];

    int32_t ivas_total_brate;

    ivas_error error;

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

    int16_t BER_detect_dummy;

    

    BER_detect_dummy = 0;

#endif

    error = IVAS_ERR_OK;



    push_wmops( "ivas_enc" );
@@ -194,6 +199,17 @@ ivas_error ivas_enc( 


            /* Stereo DMX generation */

            ivas_param_ism_stereo_dmx( st_ivas, data_f, input_frame );

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX



            /* Apply limiter on downmix */

            if ( st_ivas->hLimiter != NULL )

            {

                int16_t num_dmx_channels;



                num_dmx_channels = 2;

                ivas_limiter_apply( st_ivas->hLimiter, data_f, num_dmx_channels , input_frame, BER_detect_dummy );

            }

#endif



            /* Core coding of Stereo DMX */

            if ( ( error = ivas_ism_enc( st_ivas, data_f, input_frame, nb_bits_metadata, 0 ) ) != IVAS_ERR_OK )
@@ -486,9 +502,6 @@ ivas_error ivas_enc( 
            /* Apply limiter on downmix */

            if ( st_ivas->hLimiter != NULL )

            {

                int16_t BER_detect_dummy;



                BER_detect_dummy = 0;

                ivas_limiter_apply( st_ivas->hLimiter, data_f, st_ivas->nchan_transport, input_frame, BER_detect_dummy );

            }

#endif

lib_enc/ivas_init_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -548,6 +548,13 @@ ivas_error ivas_init_encoder( 
            {

                return error;

            }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }



        if ( st_ivas->hEncoderConfig->Opt_DTX_ON )