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

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

parent 64cf9aaf

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 
#define FIX_879_DIFF_CONCEAL_PATH               /* FhG: Fix for issue 879 and different concelalment paths that led to crash */

#define FIX_907_MEM_UPDATE_ISSUE                /* VA: fix for 907, multiples issues surrounding mem_syn_r and update of mem_syn2 when FS is changing */

#define FIX_918_WRONG_SCALING_ON_MODE_SWITCHING   /* VA: Fix wrong scaling of secondary channel when switching from stereo DFT to TD */

#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 DEVELOPMENT switches ######################### */

lib_util/render_config_reader.c

+12 −0
Original line number Diff line number Diff line
@@ -2299,7 +2299,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;
@@ -2359,7 +2363,11 @@ 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;
@@ -2369,7 +2377,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;