Commit 7fb8ffb3 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_777_COMBI_RENDER_CONFIG_FILE

parent 55bb0166

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ 
#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */



#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/



/* #################### End BASOP porting switches ############################ */

lib_util/render_config_reader.c

+0 −8
Original line number Diff line number Diff line
@@ -2299,11 +2299,7 @@ ivas_error RenderConfigReader_read( 
                    /* RT60 */

                    else if ( strcmp( item, "RT60" ) == 0 )

                    {

#ifdef FIX_777_COMBI_RENDER_CONFIG_FILE

                        if ( read_txt_vector( pValue, pRenderConfigReader->pAE[acIdx].pFG->nrBands, pRenderConfigReader->pAE[acIdx].pRT60 ) )

#else

                        if ( read_txt_vector( pValue, pRenderConfigReader->pFG[idx].nrBands, pRenderConfigReader->pAE[acIdx].pRT60 ) )

#endif

                        {

                            errorHandler( item, ERROR_VALUE_INVALID );

                            return IVAS_ERR_INVALID_RENDER_CONFIG;
@@ -2313,11 +2309,7 @@ ivas_error RenderConfigReader_read( 
                    /* DSR */

                    else if ( strcmp( item, "DSR" ) == 0 )

                    {

#ifdef FIX_777_COMBI_RENDER_CONFIG_FILE

                        if ( read_txt_vector( pValue, pRenderConfigReader->pAE[acIdx].pFG->nrBands, pRenderConfigReader->pAE[acIdx].pDSR ) )

#else

                        if ( read_txt_vector( pValue, pRenderConfigReader->pFG[idx].nrBands, pRenderConfigReader->pAE[acIdx].pDSR ) )

#endif

                        {

                            errorHandler( item, ERROR_VALUE_INVALID );

                            return IVAS_ERR_INVALID_RENDER_CONFIG;