Commit daefcdc5 authored by multrus's avatar multrus
Browse files

Merge branch '646-remove-leftover-dirac-refactor-todos' into 'main' 

Resolve "Remove leftover dirac refactor todos"

See merge request !885
parents 0af4db22 30ac6c1c

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −7
Original line number Diff line number Diff line
@@ -116,15 +116,12 @@ static void matrixMul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Ai 
static void matrixTransp2Mul( float Are[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Aim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bre[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float Bim[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outRe[BINAURAL_CHANNELS][BINAURAL_CHANNELS], float outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] );





// Todo Tapani refactor: Create separate init & render functions for MASA external renderer. The decoder versions would become too complex if generalized.



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

 * ivas_dirac_dec_init_binaural_data()

 *

 * Initialize parametric binaural renderer

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



// Todo Tapani refactor: To be moved to lib_dec

ivas_error ivas_dirac_dec_init_binaural_data(

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

    HRTFS_PARAMBIN_HANDLE hHrtfParambin /* i  : HRTF structure for rendering            */
@@ -377,7 +374,6 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
 *

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



// Todo Tapani refactor: To be moved to lib_dec

void ivas_dirac_dec_binaural_render(

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

    const uint16_t nSamplesAsked,  /* i  : number of CLDFB slots requested          */
@@ -447,7 +443,6 @@ void ivas_dirac_dec_binaural_render( 
 * loudness correction for parametric binaural renderer

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



// Todo Tapani refactor: To be moved to lib_dec

void ivas_dirac_dec_binaural_sba_gain(

    float output[][L_FRAME48k],   /* i/o: synthesized core-coder transport channels/DirAC output    */

    const int16_t nchan_remapped, /* i  : num channels after remapping of TCs                       */
@@ -482,7 +477,6 @@ void ivas_dirac_dec_binaural_sba_gain( 
 * Parametric binaural renderer main function

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



// Todo Tapani refactor: To be moved to lib_dec

void ivas_dirac_dec_binaural(

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

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i  : combined orientation handle                             */
@@ -568,7 +562,6 @@ void ivas_dirac_dec_binaural( 
 * Local functions

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



// Todo refactor: To be moved to lib_dec

static void ivas_dirac_dec_binaural_internal(

    Decoder_Struct *st_ivas,

    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,