Commit 74142fe0 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept/consolidate FIX_SPLIT_REND_MERGE

parent a800f1c8

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -4965,7 +4965,7 @@ void ivas_quantise_real_values( 
    float *quant,

    const int16_t dim

);

#ifndef FIX_SPLIT_REND_MERGE

#ifndef SPLIT_REND_WITH_HEAD_ROT

ivas_error ivas_deindex_real_index( 

	const int16_t *index, 

	const int16_t q_levels,

lib_com/options.h

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


#ifdef SPLIT_REND_WITH_HEAD_ROT



#define FIX_SPLIT_REND_MERGE                            /* Resolving the compilation warnings after splitrenderer main updation */



//#define SPLIT_REND_WITH_HEAD_ROT_DEBUG // only for debugging purposes

//#define DBG_WAV_WRITER

lib_dec/ivas_binRenderer_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ void ivas_binaural_cldfb_sf( 
{

    float Cldfb_RealBuffer[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#ifdef FIX_SPLIT_REND_MERGE

#ifdef SPLIT_REND_WITH_HEAD_ROT

    float Cldfb_RealBuffer_Binaural[1][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    float Cldfb_ImagBuffer_Binaural[1][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#else
@@ -1390,7 +1390,7 @@ void ivas_binaural_cldfb_sf( 


            for ( slot_idx = 0; slot_idx < st_ivas->hTcBuffer->subframe_nbslots[subframeIdx]; slot_idx++ )

            {

#ifdef FIX_SPLIT_REND_MERGE

#ifdef SPLIT_REND_WITH_HEAD_ROT

                RealBuffer[slot_idx] = Cldfb_RealBuffer_Binaural[0][ch][slot_idx];

                ImagBuffer[slot_idx] = Cldfb_ImagBuffer_Binaural[0][ch][slot_idx];

#else

lib_dec/ivas_dirac_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2974,7 +2974,7 @@ void ivas_dirac_dec_render_sf( 


            for ( i = 0; i < hDirAC->subframe_nbslots[subframe_idx]; i++ )

            {

#ifdef FIX_SPLIT_REND_MERGE

#ifdef SPLIT_REND_WITH_HEAD_ROT

                RealBuffer[i] = Cldfb_RealBuffer_Binaural[0][ch][i];

                ImagBuffer[i] = Cldfb_ImagBuffer_Binaural[0][ch][i];

#else

lib_dec/ivas_spar_md_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static ivas_error ivas_spar_set_dec_config( ivas_spar_md_dec_state_t *hMdDec, co 


static void ivas_parse_parameter_bitstream_dtx( ivas_spar_md_t *pSpar_md, Decoder_State *st, const int16_t bw, const int16_t num_bands, int16_t *num_dmx_per_band, int16_t *num_dec_per_band );



#ifdef FIX_SPLIT_REND_MERGE

#ifdef SPLIT_REND_WITH_HEAD_ROT

static ivas_error ivas_deindex_real_index( const int16_t *index, const int16_t q_levels, const float min_value, const float max_value, float *quant, const int16_t num_ch_dim2 );

#endif