Commit 9c925893 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix merge artefacts

parent f1e3a9e3

.gitignore

+0 −10
Original line number Diff line number Diff line
@@ -25,16 +25,6 @@ Release_*/ 
*.obj

*.pdb



#linux

IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test



*.bin

*.wav





# Unittests

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test.exe

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
#define FIX_292_VBAP_CALLOC_REMOVAL                     /* Nokia: Fixes issue 292 by removing the remnant callocs */

#define FIX_293_EXT_RENDERER_CLI                        /* FhG: Fix bugs in external renderer CLI */

#define FIX_268                                         /* Issue 268: Add low cost dry-run of memory analysis */



#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −5
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ ivas_error ivas_corecoder_dec_reconfig( 
            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->reverse_dmx = 0;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->smooth_ratio = 1.f;

#ifdef SBA_BR_SWITCHING_RECONFIG

            set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[0], 0, MAX_SFB );

            set_s( st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->prev_ms_mask[1], 0, MAX_SFB );

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->lastCoh = 1.f;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode[0] = SMDCT_DUAL_MONO;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->mdct_stereo_mode[1] = SMDCT_DUAL_MONO;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[0] = -1;

            st_ivas->hCPE[st_ivas->nCPE - 1]->hStereoMdct->IGFStereoMode[1] = -1;

#endif

lib_dec/ivas_dirac_dec_binaural_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
        /* Initialise tables from ROM */

        HRTFS_PARAMBIN *hrtfParambin;



        if ( ( hrtfParambin = (HRTFS_PARAMBIN *) count_malloc( sizeof( HRTFS_PARAMBIN ) ) ) == NULL )

        if ( ( hrtfParambin = (HRTFS_PARAMBIN *) malloc( sizeof( HRTFS_PARAMBIN ) ) ) == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Could not allocate memory for parametric binauralizer HRTF tables" );

        }

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -588,9 +588,7 @@ ivas_error ivas_init_decoder_front( 
        {

            return error;

        }

#endif



#ifdef HRTF_BINARY_FILE

        if ( ( error = ivas_HRTF_fastconv_binary_open( &st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -1727,9 +1725,7 @@ void ivas_destroy_dec( 
        destroy_SetOfHRTF( st_ivas->hSetOfHRTF );

        ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );

    }

#endif



#ifdef HRTF_BINARY_FILE

    /* Fastconv HRTF filters */

    if ( st_ivas->hHrtfFastConv != NULL )

    {