Commit d5f7a0ca authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

Merge branch '1725_ref_port_fl1408' into 'float-pc' 

Port float MR1408 to float-pc

See merge request !1724
parents 06323e73 ffbca9c7

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
#endif







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

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

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

lib_util/render_config_reader.c

+8 −0
Original line number Diff line number Diff line
@@ -2305,7 +2305,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;
@@ -2315,7 +2319,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;