Commit 5ab88232 authored by Jan Kiene's avatar Jan Kiene
Browse files

rename DISABLE_LIMITER -> DISABLE_LIMITER_IN_DECODER 

limiter is now there in encoder as well. The DISABLE_LIMITER
switch is mainly used for debugging and the 20ms vs 5ms rendering
test which is not affected by the encoder side application of the limiter.
parent c861f016

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -181,8 +181,8 @@ stages: 
  - Pop-Location



.disable-limiter: &disable-limiter

# automatically enable #define DISABLE_LIMITER in options.h, handling both /**/-comment and //-comment

  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*DISABLE_LIMITER\)[[:space:]]*\*\//\1/g" ./lib_com/options.h

# automatically enable #define DISABLE_LIMITER_IN_DECODER in options.h, handling both /**/-comment and //-comment

  - sed -i.bak -e "s/\/\*[[:space:]]*\(#define[[:space:]]*DISABLE_LIMITER_IN_DECODER\)[[:space:]]*\*\//\1/g" ./lib_com/options.h



.get-commits-behind-count: &get-commits-behind-count

  - echo $CI_COMMIT_SHA

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
/*#define DEBUG_AGC_ENCODER_CMD_OPTION*/        /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */

/*#define DEBUG_JBM_CMD_OPTION*/                /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

/*#define VARIABLE_SPEED_DECODING*/             /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

/*#define DISABLE_LIMITER*/                     /* disable the limiter */

/*#define DISABLE_LIMITER_IN_DECODER*/                     /* disable the limiter */



/*Split Rendering Debug switches*/

/*#define DBG_WAV_WRITER*/                      /* add debugging function dbgwrite_wav() */
@@ -150,7 +150,7 @@ 


/* keep as part of options.h */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

/*#define DISABLE_LIMITER */                            /* test switch for testing BE between 5ms and 20ms rendering                                                  */ 

/*#define DISABLE_LIMITER_IN_DECODER */                            /* test switch for testing BE between 5ms and 20ms rendering                                                  */ 



/* ################## Start DEVELOPMENT switches ######################### */

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1545,7 +1545,7 @@ ivas_error ivas_jbm_dec_render( 
    {

        if ( st_ivas->ivas_format != MONO_FORMAT )

        {

#ifndef DISABLE_LIMITER

#ifndef DISABLE_LIMITER_IN_DECODER

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            ivas_limiter_apply( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#else
@@ -1815,7 +1815,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    {

        if ( st_ivas->ivas_format != MONO_FORMAT )

        {

#ifndef DISABLE_LIMITER

#ifndef DISABLE_LIMITER_IN_DECODER

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            ivas_limiter_apply( st_ivas->hLimiter, p_output, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#else

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1821,7 +1821,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    {

        if ( st_ivas->hDecoderConfig->render_framesize == IVAS_RENDER_FRAMESIZE_5MS )

        {

#ifndef DISABLE_LIMITER

#ifndef DISABLE_LIMITER_IN_DECODER

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            ivas_limiter_apply( st_ivas->hLimiter, pOutput, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToDecode, st_ivas->BER_detect );

#else

lib_isar/lib_isar_post_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void accumulate2dArrayToBuffer( 
    return;

}



#ifndef DISABLE_LIMITER

#ifndef DISABLE_LIMITER_IN_DECODER



/*-------------------------------------------------------------------*

 * limitRendererOutput()
@@ -1676,7 +1676,7 @@ ivas_error ISAR_POST_REND_getSamples( 
        return error;

    }



#ifndef DISABLE_LIMITER

#ifndef DISABLE_LIMITER_IN_DECODER

#ifdef DEBUGGING

    hIvasRend->numClipping +=

#endif