Commit 410d900a authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

Merge branch '1725_basop_port_fl1408' into 'main-pc' 

Port float MR1408 to main-pc

See merge request !1723
parents 063bc0d7 9f29d7a4

lib_com/options.h

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


#endif





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

#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO       /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */

#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

lib_util/render_config_reader.c

+8 −0
Original line number Diff line number Diff line
@@ -2255,7 +2255,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;
@@ -2265,7 +2269,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;