Commit 7af19719 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Support for multiple acoustic environments plus early reflections in... 

Support for multiple acoustic environments plus early reflections in text-based configuration (prototype)
parent 02aa6faa

lib_util/render_config_reader.c

+6 −3
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ ivas_error RenderConfigReader_read( 
                }

                free( pValue );

            }

            if ( strcmp( pToken, "FREQUENCYGRID" ) == 0 )

            else if ( strcmp( pToken, "FREQUENCYGRID" ) == 0 )

            {

                if ( pRenderConfigReader->pFG == NULL )

                {
@@ -1836,6 +1836,9 @@ ivas_error RenderConfigReader_read( 
                idx = strtol( strtok( NULL, ":" ), NULL, 0 );

                if ( idx >= pRenderConfigReader->nFG )

                {

#ifdef DEBUGGING

                    fprintf( stderr, "Frequency grid with index %d does not fit into the frequency grid array of %d elements.\n", idx, pRenderConfigReader->nFG );

#endif

                    return IVAS_ERR_INVALID_RENDER_CONFIG;

                }
@@ -1854,7 +1857,7 @@ ivas_error RenderConfigReader_read( 
                        {

                            fgMode = FREQ_GRID_MODE_INDIVIDUAL_FREQUENCIES;

                        }

                        else if ( strcmp( pValue, "INDIVIDUALFREQUENCIES" ) == 0 )

                        else if ( strcmp( pValue, "STARTHOPAMOUNT" ) == 0 )

                        {

                            fgMode = FREQ_GRID_MODE_START_HOP_AMOUNT;

                        }
@@ -2027,7 +2030,7 @@ ivas_error RenderConfigReader_read( 
                free( pValue );

            }

            /* Handle multiple acoustic environments */

            if ( strcmp( pToken, "ACOUSTICENVIRONMENT" ) == 0 )

            else if ( strcmp( pToken, "ACOUSTICENVIRONMENT" ) == 0 )

            {

                if ( pRenderConfigReader->pAE == NULL || acIdx >= pRenderConfigReader->nAE )

                {