Loading lib_dec/ivas_binRenderer_internal.c +28 −65 Original line number Diff line number Diff line Loading @@ -1566,6 +1566,8 @@ static void ivas_free_pppHrtfMem( float ****ppppHRIR, int16_t dim, int16_t alloc free( ( *ppppHRIR )[i] ); ( *ppppHRIR )[i] = NULL; } free( *ppppHRIR ); *ppppHRIR = NULL; } } /*------------------------------------------------------------------------- Loading @@ -1578,75 +1580,36 @@ void ivas_binaural_hrtf_close( HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i : fastconv HRTF handle */ ) { int16_t allocate_init_flag; if ( hHrtfFastConv == NULL || *hHrtfFastConv == NULL ) { return; } ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal ); ( *hHrtfFastConv )->leftHRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag ); ( *hHrtfFastConv )->leftHRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal ); ( *hHrtfFastConv )->rightHRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag ); ( *hHrtfFastConv )->rightHRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftBRIRReal ); ( *hHrtfFastConv )->leftBRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftBRIRImag ); ( *hHrtfFastConv )->leftBRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightBRIRReal ); ( *hHrtfFastConv )->rightBRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightBRIRImag ); ( *hHrtfFastConv )->rightBRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_HOA3 ); ( *hHrtfFastConv )->leftHRIRReal_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_HOA3 ); ( *hHrtfFastConv )->leftHRIRImag_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_HOA3 ); ( *hHrtfFastConv )->rightHRIRReal_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_HOA3 ); ( *hHrtfFastConv )->rightHRIRImag_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_HOA2 ); ( *hHrtfFastConv )->leftHRIRReal_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_HOA2 ); ( *hHrtfFastConv )->leftHRIRImag_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_HOA2 ); ( *hHrtfFastConv )->rightHRIRReal_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_HOA2 ); ( *hHrtfFastConv )->rightHRIRImag_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_FOA ); ( *hHrtfFastConv )->leftHRIRReal_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_FOA ); ( *hHrtfFastConv )->leftHRIRImag_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_FOA ); ( *hHrtfFastConv )->rightHRIRReal_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_FOA ); ( *hHrtfFastConv )->rightHRIRImag_FOA = NULL; allocate_init_flag = ( *hHrtfFastConv )->allocate_init_flag; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag ); } #endif Loading Loading
lib_dec/ivas_binRenderer_internal.c +28 −65 Original line number Diff line number Diff line Loading @@ -1566,6 +1566,8 @@ static void ivas_free_pppHrtfMem( float ****ppppHRIR, int16_t dim, int16_t alloc free( ( *ppppHRIR )[i] ); ( *ppppHRIR )[i] = NULL; } free( *ppppHRIR ); *ppppHRIR = NULL; } } /*------------------------------------------------------------------------- Loading @@ -1578,75 +1580,36 @@ void ivas_binaural_hrtf_close( HRTFS_FASTCONV_HANDLE *hHrtfFastConv /* i : fastconv HRTF handle */ ) { int16_t allocate_init_flag; if ( hHrtfFastConv == NULL || *hHrtfFastConv == NULL ) { return; } ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal ); ( *hHrtfFastConv )->leftHRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag ); ( *hHrtfFastConv )->leftHRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal ); ( *hHrtfFastConv )->rightHRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag ); ( *hHrtfFastConv )->rightHRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftBRIRReal ); ( *hHrtfFastConv )->leftBRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftBRIRImag ); ( *hHrtfFastConv )->leftBRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRReal, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightBRIRReal ); ( *hHrtfFastConv )->rightBRIRReal = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRImag, HRTF_LS_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightBRIRImag ); ( *hHrtfFastConv )->rightBRIRImag = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_HOA3 ); ( *hHrtfFastConv )->leftHRIRReal_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_HOA3 ); ( *hHrtfFastConv )->leftHRIRImag_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_HOA3 ); ( *hHrtfFastConv )->rightHRIRReal_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA3, HOA3_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_HOA3 ); ( *hHrtfFastConv )->rightHRIRImag_HOA3 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_HOA2 ); ( *hHrtfFastConv )->leftHRIRReal_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_HOA2 ); ( *hHrtfFastConv )->leftHRIRImag_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_HOA2 ); ( *hHrtfFastConv )->rightHRIRReal_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA2, HOA2_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_HOA2 ); ( *hHrtfFastConv )->rightHRIRImag_HOA2 = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRReal_FOA ); ( *hHrtfFastConv )->leftHRIRReal_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->leftHRIRImag_FOA ); ( *hHrtfFastConv )->leftHRIRImag_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRReal_FOA ); ( *hHrtfFastConv )->rightHRIRReal_FOA = NULL; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, ( *hHrtfFastConv )->allocate_init_flag ); free( ( *hHrtfFastConv )->rightHRIRImag_FOA ); ( *hHrtfFastConv )->rightHRIRImag_FOA = NULL; allocate_init_flag = ( *hHrtfFastConv )->allocate_init_flag; ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftBRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRReal, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightBRIRImag, HRTF_LS_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA3, HOA3_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_HOA2, HOA2_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->leftHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRReal_FOA, FOA_CHANNELS, allocate_init_flag ); ivas_free_pppHrtfMem( &( *hHrtfFastConv )->rightHRIRImag_FOA, FOA_CHANNELS, allocate_init_flag ); } #endif Loading