Commit 656bfd62 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Cleanup parentheses and duplicate fix for second search struct.

parent 56984157

lib_rend/ivas_vbap_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ ivas_error vbap_init_data_fx( 


#ifdef FIX_BASOP_2288_VBAP_MALLOC

        Word16 num_triplets = 0;

        num_triplets = s_max( 0, ( ( speaker_nodes_group1_internal - 2 ) * 2 - ( s_max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) );

        num_triplets = s_max( 0, ( speaker_nodes_group1_internal - 2 ) * 2 - s_max( 0, speaker_nodes_horiz_internal - 2 ) );

        move16();



        IF( ( vbap->search_struct[0].triplets = (VBAP_VS_TRIPLET *) malloc( num_triplets * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL )
@@ -381,7 +381,14 @@ ivas_error vbap_init_data_fx( 
        {

            vbap->num_search_structs = 2;

            move16();

#ifdef FIX_BASOP_2288_VBAP_MALLOC

            num_triplets = s_max( 0, ( speaker_nodes_group2_internal - 2 ) * 2 - s_max( 0, speaker_nodes_horiz_internal - 2 ) );

            move16();



            IF( ( vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) malloc( num_triplets * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL )

#else

            IF( ( vbap->search_struct[1].triplets = (VBAP_VS_TRIPLET *) malloc( ( ( speaker_nodes_group2_internal - 2 ) * 2 - ( s_max( 0, ( speaker_nodes_horiz_internal - 2 ) ) ) ) * sizeof( VBAP_VS_TRIPLET ) ) ) == NULL )

#endif

            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for VBAP data\n" ) );

            }