Commit 5f546048 authored by Devansh Kandpal's avatar Devansh Kandpal
Browse files

First commit - decalred compiler switch and constants for MR 1489

parent 0bb7c3d0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 




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

#define FIX_1053_REVERB_RECONFIGURATION                   /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#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_dec/ivas_rom_dec.h

+2 −2
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ extern const uint16_t *const sym_freq_ECSQ_tab_abs_lsbs[1 + 4]; 
extern const float dirac_dithering_azi_scale[DIRAC_DIFFUSE_LEVELS];

extern const float dirac_dithering_ele_scale[DIRAC_DIFFUSE_LEVELS];





#ifndef FIX_1053_REVERB_RECONFIGURATION

/*----------------------------------------------------------------------------------*

 * FASTCONV and PARAMETRIC binaural renderer ROM tables

 *----------------------------------------------------------------------------------*/



extern const float dmxmtx_table[BINAURAL_CHANNELS][11];



#endif



/*----------------------------------------------------------------------*

 * MC ParamUpmix ROM tables

lib_rend/ivas_stat_rend.h

+2 −0
Original line number Diff line number Diff line
@@ -480,7 +480,9 @@ typedef struct ivas_binaural_reverb_struct 
    uint32_t binRend_RandNext;

    int16_t highestBinauralCoherenceBin;



#ifndef FIX_1053_REVERB_RECONFIGURATION

    float dmxmtx[BINAURAL_CHANNELS][MAX_OUTPUT_CHANNELS];

#endif

    float foa_enc[MAX_OUTPUT_CHANNELS][FOA_CHANNELS];



} REVERB_STRUCT, *REVERB_STRUCT_HANDLE;

lib_rend/lib_rend.c

+12 −0
Original line number Diff line number Diff line
@@ -4504,8 +4504,17 @@ int16_t IVAS_REND_FeedRenderConfig( 
)

{

    RENDER_CONFIG_HANDLE hRenderConfig;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    uint16_t i;

    input_ism *pIsmInput;

    input_masa *pMasaInput;

    input_mc *pMcInput;

    input_sba *pSbaInput;

    ivas_error error;

#else

#ifdef SPLIT_REND_WITH_HEAD_ROT

    ivas_error error;

#endif

#endif



    if ( hIvasRend == NULL || hIvasRend->hRendererConfig == NULL )
@@ -4537,6 +4546,9 @@ int16_t IVAS_REND_FeedRenderConfig( 
        mvr2r( renderConfig.roomAcoustics.AbsCoeff, hRenderConfig->roomAcoustics.AbsCoeff, IVAS_ROOM_ABS_COEFF );

    }



#ifdef FIX_1053_REVERB_RECONFIGURATION

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    hRenderConfig->split_rend_config = renderConfig.split_rend_config;

    /* Overwrite any pose correction settings if 0 DOF (no pose correction) was selected */

lib_util/render_config_reader.c

+6 −0
Original line number Diff line number Diff line
@@ -2842,6 +2842,12 @@ ivas_error RenderConfigReader_getAcousticEnvironment( 
                    pAcEnv->AbsCoeff[j] = pRenderConfigReader->pAE[n].pEarlyReflections->pAbsCoeff[j];

                }

            }

#ifdef FIX_1053_REVERB_RECONFIGURATION

            else

            {

                pAcEnv->use_er = false;

            }

#endif

            return IVAS_ERR_OK;

        }

    }