diff --git a/apps/decoder.c b/apps/decoder.c index 9b200437860261752c15aebf2de04a26be3f9bb8..59452aaca77c06836e38fc2005d3a0a8f0560a72 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3909,7 +3909,13 @@ static ivas_error decodeVoIP( numPiData++; } - if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData +#ifdef DEBUGGING + , + renderConfig +#endif + + ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index de95304301e1510ec565a371d2c06fd03f1f0d1c..425b4c9b28308de803e74e9543a310507d3a07b4 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3727,6 +3727,10 @@ ivas_error IVAS_DEC_FeedRenderConfig( static ivas_error feedAcousticEnvPI( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ const IVAS_PIDATA_ACOUSTIC_ENV hAcoustEnvPI /* i : Render configuration struct */ +#ifdef DEBUGGING + , + const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ +#endif ) { RENDER_CONFIG_HANDLE hRenderConfig; @@ -3743,11 +3747,11 @@ static ivas_error feedAcousticEnvPI( #ifdef DEBUGGING hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE; - if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) + if ( renderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) { hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV; } - if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND ) + if ( renderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND ) { hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND; } @@ -6151,6 +6155,10 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ hPiDataTs piData, /* i : PI data received in rtp packet */ uint32_t numPiData /* i : number of PI data received in rtp packet */ +#ifdef DEBUGGING + , + const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ +#endif ) { uint32_t i; @@ -6200,7 +6208,12 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( if ( piData->data.acousticEnv.availLateReverb && st_ivas->hRenderConfig != NULL && aeid != st_ivas->hRenderConfig->roomAcoustics.aeID ) { - error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv ); + error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv +#ifdef DEBUGGING + , + renderConfig +#endif + ); } } break; diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 24a663bd35c8d355d60cacedae8591d6bd275e66..1255c60f92df99415bffb6391c15cf35e8a71dfa 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -553,6 +553,9 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ hPiDataTs piData, /* i : PI data received in rtp packet */ uint32_t numPiData /* i : number of PI data received in rtp packet */ +#ifdef DEBUGGING + ,const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ +#endif ); #endif