Unverified Commit 5957044e authored by norvell's avatar norvell
Browse files

Cleanup

parent 00bd7ed6

apps/decoder.c

+4 −4
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifdef FIX_2500_RENDCONF_REFACTOR

        if ( RenderConfigReader_checkValues( renderConfigReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nInvalid render configuration parameters\n\n" );
@@ -704,7 +704,7 @@ int main( 
        {

            if ( ( error = IVAS_DEC_GetAcousticEnvironment( hIvasDec, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

            {

#ifndef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifndef FIX_2500_RENDCONF_REFACTOR

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Invalid reverberation configuration parameters\n\n" );
@@ -2351,7 +2351,7 @@ static ivas_error decodeG192( 
            goto cleanup;

        }



#ifdef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifdef FIX_2500_RENDCONF_REFACTOR

        if ( RenderConfigReader_checkValues( renderConfigReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nInvalid render configuration parameters\n\n" );
@@ -2559,7 +2559,7 @@ static ivas_error decodeG192( 
                        arg.aeSequence.frameCounter = 0;

                        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

                        {

#ifndef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifndef FIX_2500_RENDCONF_REFACTOR

                            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                            {

                                fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifdef FIX_2500_RENDCONF_REFACTOR

        if ( RenderConfigReader_checkValues( renderConfigReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nInvalid render configuration parameters\n\n" );
@@ -1151,7 +1151,7 @@ int main( 
            aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : IVAS_DEFAULT_AEID;

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

            {

#ifndef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifndef FIX_2500_RENDCONF_REFACTOR

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nInvalid room acoustics configuration parameters\n\n" );
@@ -1572,7 +1572,7 @@ int main( 
                args.aeSequence.frameCounter = 0;

                if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.aeSequence.pID[args.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

                {

#ifndef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifndef FIX_2500_RENDCONF_REFACTOR

                    if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nInvalid acoustic environment configuration parameters\n\n" );

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 


#define USE_RTPDUMP                                     /* FhG: RTPDUMP format (rtptools standard) instead of custom format */

#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

#define FIX_2500_ISM4_BIN_REVERB_DISTORTION             /* FhG: Basop issue #2500: Move RenderConfigReader_checkValues() to operate on RenderConfigReader float values before fixed-point conversion. */

#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, synch with BASOP updates and adding clamping of distance att input and listener position  */

#define FIX_1574_EFAP_CODE_LINT                         /* FhG: issue 1574: Code quality fixes in ivas_efap.c */

#define FIX_FLOAT_1569_REND_RENDER_CONFIG_CHECKS        /* Nokia: float issue 1569: fix render config checks in renderer */

lib_util/render_config_reader.c

+3 −3
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ static int32_t errorHandler( 
 * Verifies if the configuration parameters lie within acceptable limits

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



#ifdef FIX_2500_ISM4_BIN_REVERB_DISTORTION

#ifdef FIX_2500_RENDCONF_REFACTOR

ivas_error RenderConfigReader_checkValues(

    RenderConfigReader *pRenderConfigReader /* i/o : RenderConfigReader handle              */

)
@@ -1379,7 +1379,7 @@ ivas_error RenderConfigReader_checkValues( 


    return IVAS_ERR_OK;

}

#else  /* !FIX_2500_ISM4_BIN_REVERB_DISTORTION */

#else

ivas_error RenderConfigReader_checkValues(

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o  : Renderer configuration handle          */

)
@@ -1514,7 +1514,7 @@ ivas_error RenderConfigReader_checkValues( 


    return IVAS_ERR_OK;

}

#endif /* FIX_2500_ISM4_BIN_REVERB_DISTORTION */

#endif





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

lib_util/render_config_reader.h

+3 −5
Original line number Diff line number Diff line
@@ -79,15 +79,13 @@ ivas_error RenderConfigReader_getDistanceAttenuation( 
    float *distAtt                           /* o  : Distance attenuation                   */

);

/* Verifies configuration parameters                                                        */

#ifdef FIX_2500_ISM4_BIN_REVERB_DISTORTION

ivas_error RenderConfigReader_checkValues(

#ifdef FIX_2500_RENDCONF_REFACTOR

    RenderConfigReader *pRenderConfigReader /* i/o : RenderConfigReader handle             */

);

#else

ivas_error RenderConfigReader_checkValues(

    IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o  : Renderer configuration handle           */

);

#endif

);



/* Reads a configuration                                                                    */

ivas_error RenderConfigReader_read(