Commit 8cd209a4 authored by vaclav's avatar vaclav
Browse files

rename IVAS_MAX_CICP_CHANNELS -> IVAS_MAX_LS_CHANNELS

parent 34637209

lib_com/common_api_types.h

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )                 /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */



#define IVAS_MAX_NUM_OBJECTS       4

#define IVAS_MAX_CICP_CHANNELS     16

#define IVAS_MAX_LS_CHANNELS       16

#define IVAS_CLDFB_NO_COL_MAX      16

#define IVAS_CLDFB_NO_CHANNELS_MAX 60
@@ -189,10 +189,10 @@ typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT; 
typedef struct _IVAS_LS_CUSTOM_LAYOUT

{

    int16_t num_spk;

    float azimuth[IVAS_MAX_CICP_CHANNELS];

    float elevation[IVAS_MAX_CICP_CHANNELS];

    float azimuth[IVAS_MAX_LS_CHANNELS];

    float elevation[IVAS_MAX_LS_CHANNELS];

    int16_t num_lfe;

    int16_t lfe_idx[IVAS_MAX_CICP_CHANNELS];

    int16_t lfe_idx[IVAS_MAX_LS_CHANNELS];



} IVAS_CUSTOM_LS_DATA;

lib_com/ivas_cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -128,12 +128,12 @@ typedef enum 
 * IVAS general constants

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



#define MAX_INPUT_CHANNELS                      16                          /* Maximum number of input channels (HOA 3rd order or IVAS_MAX_CICP_CHANNELS) without separate objects in combined formats */

#define MAX_INPUT_CHANNELS                      16                          /* Maximum number of input channels (HOA 3rd order or IVAS_MAX_LS_CHANNELS) without separate objects in combined formats */

#define MAX_TRANSPORT_CHANNELS                  12                          /* Maximum number of transport channels */

#define MAX_INTERN_CHANNELS                     16                          /* Maximum number of intern channels (HOA 3rd order) */

#define HEAD_ROTATION_HOA_ORDER                 3                           /* HOA 3rd order */

#define MAX_CICP_CHANNELS                       16                          /* max channels for loudspeaker layouts (16 for custom layouts), == IVAS_MAX_CICP_CHANNELS */

#define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order or IVAS_MAX_CICP_CHANNELS) without separate objects in combined formats */

#define MAX_CICP_CHANNELS                       16                          /* max channels for loudspeaker layouts (16 for custom layouts), == IVAS_MAX_LS_CHANNELS */

#define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order or IVAS_MAX_LS_CHANNELS) without separate objects in combined formats */

#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN     2                           /* Maximum number of output channels with non diegetic panning */



#define BINAURAL_CHANNELS                       2                           /* number of channels for binaural output configuration */

lib_rend/lib_rend.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
 * Renderer constants

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



#define RENDERER_MAX_OUTPUT_CHANNELS    IVAS_MAX_CICP_CHANNELS

#define RENDERER_MAX_INPUT_CHANNELS     IVAS_MAX_CICP_CHANNELS

#define RENDERER_MAX_OUTPUT_CHANNELS    IVAS_MAX_LS_CHANNELS

#define RENDERER_MAX_INPUT_CHANNELS     IVAS_MAX_LS_CHANNELS

#define RENDERER_MAX_ISM_INPUTS         IVAS_MAX_NUM_OBJECTS

#define RENDERER_MAX_MC_INPUTS          1

#define RENDERER_MAX_SBA_INPUTS         1

lib_util/ls_custom_file_reader.c

+12 −12
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate( 
{

    int16_t i, j;

    int16_t dup_count;

    int16_t dup[IVAS_MAX_CICP_CHANNELS];

    float azi_tmp[IVAS_MAX_CICP_CHANNELS];

    float ele_tmp[IVAS_MAX_CICP_CHANNELS];

    int16_t dup[IVAS_MAX_LS_CHANNELS];

    float azi_tmp[IVAS_MAX_LS_CHANNELS];

    float ele_tmp[IVAS_MAX_LS_CHANNELS];



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

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

    {

        dup[i] = 0;

        azi_tmp[i] = 0.0f;
@@ -143,7 +143,7 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate( 
        return LS_CUSTOM_FILEREADER_LFE_NUM_SPK_EXCEEDED_ERROR;

    }



    if ( ( *num_azi + num_lfe ) > IVAS_MAX_CICP_CHANNELS )

    if ( ( *num_azi + num_lfe ) > IVAS_MAX_LS_CHANNELS )

    {

        return LS_CUSTOM_FILEREADER_OUTPUT_NCHAN_EXCEEDED_ERROR;

    }
@@ -182,7 +182,7 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate( 


    ( *num_azi ) -= dup_count;



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

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

    {

        azi[i] = azi_tmp[i];

        ele[i] = ele_tmp[i];
@@ -240,7 +240,7 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( 
{

    LS_CUSTOM_FILEREADER_ERROR error;



    char line[200]; /* > (10 chars * IVAS_MAX_CICP_CHANNELS) i.e. "-999,     " */

    char line[200]; /* > (10 chars * IVAS_MAX_LS_CHANNELS) i.e. "-999,     " */

    const char *tok;



    int16_t i, num_azi, num_ele, num_lfe;
@@ -250,7 +250,7 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( 
    num_ele = 0;

    num_lfe = 0;



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

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

    {

        hLsCustomData->lfe_idx[i] = -1;

        hLsCustomData->azimuth[i] = 0.0f;
@@ -282,7 +282,7 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( 
            continue;

        }



        if ( num_azi >= IVAS_MAX_CICP_CHANNELS )

        if ( num_azi >= IVAS_MAX_LS_CHANNELS )

        {

            return LS_CUSTOM_FILEREADER_AZI_NUM_SPK_EXCEEDED_ERROR;

        }
@@ -311,7 +311,7 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( 
            continue;

        }



        if ( num_ele >= IVAS_MAX_CICP_CHANNELS )

        if ( num_ele >= IVAS_MAX_LS_CHANNELS )

        {

            return LS_CUSTOM_FILEREADER_ELE_NUM_SPK_EXCEEDED_ERROR;

        }
@@ -337,14 +337,14 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading( 
                continue;

            }



            if ( num_lfe > IVAS_MAX_CICP_CHANNELS )

            if ( num_lfe > IVAS_MAX_LS_CHANNELS )

            {

                return LS_CUSTOM_FILEREADER_LFE_NUM_SPK_EXCEEDED_ERROR;

            }

            else

            {

                hLsCustomData->lfe_idx[num_lfe] = (int16_t) atoi( tok );

                if ( hLsCustomData->lfe_idx[num_lfe] < 0 || hLsCustomData->lfe_idx[num_lfe] > ( IVAS_MAX_CICP_CHANNELS - 1 ) )

                if ( hLsCustomData->lfe_idx[num_lfe] < 0 || hLsCustomData->lfe_idx[num_lfe] > ( IVAS_MAX_LS_CHANNELS - 1 ) )

                {

                    return LS_CUSTOM_FILEREADER_LFE_INDEX_ERROR;

                }