Commit 4cef93cd authored by vaclav's avatar vaclav
Browse files

add returns

parent 90fc193b

lib_enc/ivas_masa_enc.c

+18 −5
Original line number Diff line number Diff line
@@ -2171,6 +2171,7 @@ static void transform_index_and_GR_encode( 
    return;

}





static int16_t encode_ratio_ism_subframe(

    int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    int16_t no_ism,
@@ -2579,6 +2580,7 @@ static void ivas_encode_masaism_metadata( 
    {

        bits_ism[obj] = bits_direction_masa[0] - (int16_t) ( ( 1 - priority[obj] ) * 7 );

    }



    /* this is only the first version */

    /* quantize directions */

    for ( obj = 0; obj < hMasa->data.nchan_ism; obj++ )
@@ -2586,10 +2588,19 @@ static void ivas_encode_masaism_metadata( 
        idx_sph = quantize_direction( hIsmMeta[obj]->elevation, hIsmMeta[obj]->azimuth, bits_ism[obj], &theta_q, &phi_q, &index_theta, &index_phi, MC_LS_SETUP_INVALID );

        push_next_indice( hMetaData, idx_sph, bits_ism[obj] );

    }



    return;

}





void ivas_merge_masa_transports( float data_in_f1[][L_FRAME48k],

/*-------------------------------------------------------------------*

 * ivas_merge_masa_transports()

 *

 * Merge MASA transport channels

 *-------------------------------------------------------------------*/



void ivas_merge_masa_transports(

    float data_in_f1[][L_FRAME48k],

    float data_in_f2[][L_FRAME48k],

    float data_out_f[][L_FRAME48k],

    const int16_t input_frame,
@@ -2604,5 +2615,7 @@ void ivas_merge_masa_transports( float data_in_f1[][L_FRAME48k], 
            data_out_f[i][j] = data_in_f1[i][j] + data_in_f2[i][j];

        }

    }



    return;

}

#endif