Commit d3bd4fde authored by norvell's avatar norvell
Browse files

Merge branch '726-evs-be-failure-with-api_5ms-activated' into 'main' 

[Non BE] Fix for limiter deactivation in EVS and AMR-WB IO modes under API_5MS

See merge request !993
parents 41b679b7 541d242e

apps/renderer.c

+1 −3
Original line number Diff line number Diff line
@@ -218,9 +218,7 @@ typedef enum 
#endif

    CmdLnOptionId_referenceVectorFile,

    CmdLnOptionId_exteriorOrientationFile,

#ifdef API_5MS

    CmdLnOptionId_framing5ms,

#endif

    CmdLnOptionId_syncMdDelay,

    CmdLnOptionId_directivityPatternId,

    CmdLnOptionId_acousticEnvironmentId
@@ -1534,8 +1532,8 @@ int main( 
#endif

        );



#ifdef API_5MS

        int16_t num_subframes, sf_idx;

#ifdef API_5MS

        num_subframes = ( args.framing_5ms ) ? 1 : IVAS_MAX_PARAM_SPATIAL_SUBFRAMES;

#else

        num_subframes = IVAS_MAX_PARAM_SPATIAL_SUBFRAMES;

lib_dec/ivas_jbm_dec.c

+16 −3
Original line number Diff line number Diff line
@@ -1192,9 +1192,15 @@ ivas_error ivas_jbm_dec_render( 
    if ( st_ivas->hDecoderConfig->Opt_Limiter )

#endif

    {



#ifdef API_5MS

        if ( !( st_ivas->ivas_format == MONO_FORMAT ) )

        {

#endif

#ifndef DISABLE_LIMITER

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

#endif

#ifdef API_5MS

        }

#endif

    }
@@ -1404,8 +1410,15 @@ ivas_error ivas_jbm_dec_flush_renderer( 
    if ( st_ivas->hDecoderConfig->Opt_Limiter )

#endif

    {

#ifdef API_5MS

        if ( !( st_ivas->ivas_format == MONO_FORMAT ) )

        {

#endif

#ifndef DISABLE_LIMITER

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

#endif

#ifdef API_5MS

        }

#endif

    }