Commit ad061ae5 authored by Malenovsky, Vladimir's avatar Malenovsky, Vladimir
Browse files

add renderConfig as an input parameter to feedAcousticEnvPI()

parent 31da3228

apps/decoder.c

+6 −1
Original line number Diff line number Diff line
@@ -3909,7 +3909,12 @@ 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;

lib_dec/lib_dec.c

+12 −1
Original line number Diff line number Diff line
@@ -3727,6 +3727,9 @@ 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;
@@ -6151,6 +6154,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 +6207,11 @@ 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;

lib_dec/lib_dec.h

+3 −0
Original line number Diff line number Diff line
@@ -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