Commit b1803b40 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Added fixes for issues #777 and #1020 of IVAS codec

parent d9fdb374

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ 
#define FIX_828_PORT_1152_FROM_FLT_REPO                  /* FhG: fix for issue 828 - fix uninitialized value used in BASOP */

#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: issue 835: wide range of buffer values for cx in ParamMC */

#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: isse #777 (IVAS codec): Fix for combined renderer config file support */

#define FIX_1020_AEID_SELECTION_ERRORS                  /* Philips: issue #1020 (IVAS codec): fix for acoustic environment ID selection errors */



/* #################### End FIXES switches ############################ */



#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

lib_util/render_config_reader.c

+13 −0
Original line number Diff line number Diff line
@@ -2233,7 +2233,11 @@ ivas_error RenderConfigReader_read( 
                    return IVAS_ERR_INVALID_RENDER_CONFIG;

                }

                idx = strtol( strtok( NULL, ":" ), NULL, 0 );

#ifdef FIX_1020_AEID_SELECTION_ERRORS

                pRenderConfigReader->pAE[acIdx].id = idx;

#else

                pRenderConfigReader->pAE->id = idx;

#endif



                aeHasFgIdx = aeHasPredelay = aeHasRt60 = aeHasDsr = FALSE;

                aeHasERsize = aeHasERabs = FALSE;
@@ -2293,7 +2297,12 @@ 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;
@@ -2303,7 +2312,11 @@ 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;