Commit 851575d9 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

change signatures of conversion functions to match the type of the float input... 

change signatures of conversion functions to match the type of the float input buffer in the encoder
parent 1fc47fa6

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ static bool parseCmdlIVAS_enc( 
        else if ( strcmp( argv_to_upper, "SBA_CONVENTION" ) == 0 )

        {

            i++;

            arg->inputFormat = AMBI_FMT_ACN_SN3D;

            arg->inputFormat = ( int16_t ) AMBI_FMT_ACN_SN3D;



            /* SBA configuration */

            if ( i < argc - 4 && is_number( argv[i] ) && sscanf( argv[i], "%d", &tmp ) > 0 )

lib_util/ambi_convert.c

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static const int16_t REORDER_ACN_SID[AMBI_MAX_CHANNELS] = { 0, 
    API functions for the conversion

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



int16_t convert_ambi_format( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_FMT in_format, AMBI_FMT out_format )

int16_t convert_ambi_format( float *in[], float *out[], int16_t order, AMBI_FMT in_format, AMBI_FMT out_format )

{

    assert( order <= 3 );
@@ -181,7 +181,7 @@ int16_t convert_ambi_format( float in[][L_FRAME48k], float out[][L_FRAME48k], in 
    return 0;

}



int16_t renormalize_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_NORM in_format, AMBI_CHANNEL_NORM out_format )

int16_t renormalize_channels( float *in[], float *out[], int16_t order, AMBI_CHANNEL_NORM in_format, AMBI_CHANNEL_NORM out_format )

{

    int16_t n_chan = ( order + 1 ) * ( order + 1 );

    int16_t i_chan, i;
@@ -236,7 +236,7 @@ int16_t renormalize_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], i 
    return 0;

}



int16_t reorder_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_ORDER in_format, AMBI_CHANNEL_ORDER out_format )

int16_t reorder_channels( float *in[], float *out[], int16_t order, AMBI_CHANNEL_ORDER in_format, AMBI_CHANNEL_ORDER out_format )

{

    int16_t n_chan = ( order + 1 ) * ( order + 1 );

    int16_t i_chan, i;

lib_util/ambi_convert.h

+3 −4
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
*******************************************************************************************************/



#include <stdint.h>

#include "ivas_cnst.h"



typedef enum

{
@@ -57,8 +56,8 @@ typedef enum 
    AMBI_CHANNEL_ORDER_SID

} AMBI_CHANNEL_ORDER;



int16_t convert_ambi_format( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_FMT in_format, AMBI_FMT out_format );

int16_t convert_ambi_format( float* in[], float* out[], int16_t order, AMBI_FMT in_format, AMBI_FMT out_format );



int16_t renormalize_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_NORM in_format, AMBI_CHANNEL_NORM out_format );

int16_t renormalize_channels( float* in[], float* out[], int16_t order, AMBI_CHANNEL_NORM in_format, AMBI_CHANNEL_NORM out_format );



int16_t reorder_channels( float in[][L_FRAME48k], float out[][L_FRAME48k], int16_t order, AMBI_CHANNEL_ORDER in_format, AMBI_CHANNEL_ORDER out_format );
 
int16_t reorder_channels( float* in[], float* out[], int16_t order, AMBI_CHANNEL_ORDER in_format, AMBI_CHANNEL_ORDER out_format );