Commit 54c17c82 authored by malenov's avatar malenov
Browse files

replacement of count_calloc() with calloc()

parent f0b9192a

apps/renderer.c

+2 −3
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static int16_t getTotalNumInChannels( 
    }



#ifdef NOKIA_MASA_EXTERNAL_RENDERER

    for ( int32_t i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

    {

        if ( masaIds[i] == 0 )

        {
@@ -924,7 +924,6 @@ int main( 
#ifdef NOKIA_MASA_EXTERNAL_RENDERER

        for ( i = 0; i < args.inConfig.numMasaBuses; ++i )

        {

            int16_t numChannels;

            if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, masaIds[i], &numChannels ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
@@ -1325,7 +1324,7 @@ static IVAS_REND_AudioConfig parseAudioConfig( 
            case '1':

                fprintf( stderr, "1TC MASA support is not functional and is pending on DirAC renderer refactoring.\n" );

                exit( EXIT_FAILURE );

                return IVAS_REND_AUDIO_CONFIG_MASA1;

                //return IVAS_REND_AUDIO_CONFIG_MASA1;

            case '2':

                return IVAS_REND_AUDIO_CONFIG_MASA2;

            default:

lib_dec/ivas_vbap.c

+3 −3
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_bottom_type != NO_VIRTUAL_SPEAKER_NODE )

    {

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

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

        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;
@@ -208,7 +208,7 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_top_type != NO_VIRTUAL_SPEAKER_NODE )

    {

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

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

        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;
@@ -216,7 +216,7 @@ ivas_error vbap_init_data( 


    if ( is_success && virtual_back_type != NO_VIRTUAL_SPEAKER_NODE )

    {

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

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

        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;

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void IVAS_ENC_Close( 
    ( *phIvasEnc )->st_ivas = NULL;



#ifdef BITSTREAM_INDICES_MEMORY

#ifdef WMC_TOOL_SKIP

#define WMC_TOOL_SKIP

    free( *phIvasEnc );

#undef WMC_TOOL_SKIP

#else