diff --git a/apps/renderer.c b/apps/renderer.c index 36ea05c60c284fff20e42b0a56bfd1b15fc75d58..858a9d4150716a9b9f7fed82136af7270b3fe57b 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -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; diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index 0880b00038263eb863d9455f4d21f385256a274f..1abebe3c0b7db844a339e2490215442679a39f0d 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -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 ); + 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 ); + ivas_limiter_dec( st_ivas->hLimiter, p_output, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect ); +#endif +#ifdef API_5MS + } #endif }