Commit 3bde0dce authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents d53b13d9 b3ff8488

.gitignore

+0 −8
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o
@@ -17,7 +16,6 @@ build*/**/* 
IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -25,12 +23,6 @@ Release_*/ 
*.obj

*.pdb



# Unittests

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test

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

scripts/ivas_pytests/tests/unit_tests/crend/Debug_*/

scripts/ivas_pytests/tests/unit_tests/crend/Release_*/



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 
#define ENHANCED_STEREO_DMX                             /* Orange : Contribution 48 - Enhanced stereo downmix. */



#define BINAURAL_AUDIO_CMDLINE

#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */



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

/* clang-format on */

lib_enc/ivas_tcx_core_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -392,10 +392,14 @@ void stereo_tcx_core_enc( 
     * Write LPC parameters

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



#ifndef FIX_570_TCX_LPC_WRITE

    n = st->coder_type; /* IVAS_fmToDo: hack to keep bit-exactness -> TBV */

    st->coder_type = INACTIVE;

#endif

    writeLPCparam( st, hBstr, param_lpc, bits_param_lpc, no_param_lpc, &total_nbbits );

#ifndef FIX_570_TCX_LPC_WRITE

    st->coder_type = n;

#endif



    assert( total_nbbits == ( nbits_lpc[0] + nbits_lpc[1] ) );

#ifdef DEBUG_MODE_TCX

lib_rend/ivas_crend.c

+2 −2
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ ivas_error ivas_rend_openCrend( 




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

 * ivas_crend_close()

 * ivas_rend_closeCrend()

 *

 * Deallocate Crend renderer handle

 *------------------------------------------------------------------------*/
@@ -1283,7 +1283,7 @@ void ivas_rend_closeCrend( 




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

 * Function ivas_crend_convolver()

 * Function ivas_rend_crendConvolver()

 *

 * Convolver block

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

lib_rend/ivas_prot_rend.h

+0 −18
Original line number Diff line number Diff line
@@ -563,24 +563,6 @@ ivas_error ivas_rend_crendProcessSubframe( 
);

#endif





ivas_error ivas_crend_init_from_rom(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



ivas_error ivas_crend_open(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



ivas_error ivas_crend_close(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



ivas_error ivas_crend_process(

     Decoder_Struct *st_ivas,                                   /* i/o: IVAS decoder structure                  */

    float output[][L_FRAME48k]                                  /* i/o: input/output audio channels             */

);



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

 * Reverberator

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