Commit 9c8faf36 authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

optimising memory allocation in fastconv renderer

parent ec85a5ba

apps/decoder.c

+0 −1
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ int main( 
        }

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv = NULL;

        IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv );



        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );

lib_com/ivas_prot.h

+12 −0
Original line number Diff line number Diff line
@@ -5144,6 +5144,18 @@ void ivas_binRenderer_close( 
    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);



#ifdef FIX_1720_HRTF_FASTCONV

void ivas_binaural_hrtf_close(

    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                */

);



ivas_error ivas_allocate_binaural_hrtf(

    HRTFS_FASTCONV *HrtfFastConv,                                   /* i  : fastconv HRTF handle                       */

    AUDIO_CONFIG output_config,                                     /* i : ouput audio config                          */

    BINAURAL_INPUT_AUDIO_CONFIG output_config_bin                  /* i : binaural input audio config                  */

);

#endif



#ifdef DEBUGGING

void ivas_binaural_cldfb(

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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

#define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */

#define FIX_MEM_REALLOC_IND_LIST                        /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/

#define FIX_1720_HRTF_FASTCONV                          /* Dlb : Binaural format RAM saving in SBA mode */



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

lib_dec/ivas_binRenderer_internal.c

+394 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_init_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ ivas_error ivas_init_decoder_front( 
        {

            return error;

        }



        if ( ( error = ivas_HRTF_parambin_binary_open( &st_ivas->hHrtfParambin ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -1874,7 +1873,9 @@ void ivas_destroy_dec( 


    /* CRend binaural renderer handle */

    ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );



#ifdef FIX_1720_HRTF_FASTCONV

    ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv );

#endif

    /* Fastconv HRTF filters */

    ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );