Commit 1cf10e89 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_292_VBAP_CALLOC_REMOVAL

parent b3f7f4c5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#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 LOW_RATE_TRANS_FIX                              /* Eri: Fix for critical item during transitions */

lib_dec/ivas_vbap.c

+0 −12
Original line number Diff line number Diff line
@@ -200,12 +200,8 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_bottom_type != NO_VIRTUAL_SPEAKER_NODE )

    {

#ifdef FIX_292_VBAP_CALLOC_REMOVAL

        vbap->bottom_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );

        set_zero( vbap->bottom_virtual_speaker_node_division_gains, num_speaker_nodes );

#else

        vbap->bottom_virtual_speaker_node_division_gains = (float *) calloc( num_speaker_nodes, sizeof( float ) );

#endif

        is_success &= vbap->bottom_virtual_speaker_node_division_gains != NULL;

        speaker_node_azi_deg_internal[vbap->bottom_virtual_speaker_node_index] = 0.0f;

        speaker_node_ele_deg_internal[vbap->bottom_virtual_speaker_node_index] = -90.0f;
@@ -213,12 +209,8 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_top_type != NO_VIRTUAL_SPEAKER_NODE )

    {

#ifdef FIX_292_VBAP_CALLOC_REMOVAL

        vbap->top_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );

        set_zero( vbap->top_virtual_speaker_node_division_gains, num_speaker_nodes );

#else

        vbap->top_virtual_speaker_node_division_gains = (float *) calloc( num_speaker_nodes, sizeof( float ) );

#endif

        is_success &= vbap->top_virtual_speaker_node_division_gains != NULL;

        speaker_node_azi_deg_internal[vbap->top_virtual_speaker_node_index] = 0.0f;

        speaker_node_ele_deg_internal[vbap->top_virtual_speaker_node_index] = 90.0f;
@@ -226,12 +218,8 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_back_type != NO_VIRTUAL_SPEAKER_NODE )

    {

#ifdef FIX_292_VBAP_CALLOC_REMOVAL

        vbap->back_virtual_speaker_node_division_gains = (float *) malloc( num_speaker_nodes * sizeof( float ) );

        set_zero( vbap->back_virtual_speaker_node_division_gains, num_speaker_nodes );

#else

        vbap->back_virtual_speaker_node_division_gains = (float *) calloc( num_speaker_nodes, sizeof( float ) );

#endif

        is_success &= vbap->back_virtual_speaker_node_division_gains != NULL;

        speaker_node_azi_deg_internal[vbap->back_virtual_speaker_node_index] = 180.0f;

        speaker_node_ele_deg_internal[vbap->back_virtual_speaker_node_index] = 0.0f;