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

- Merge remote-tracking branch 'remotes/origin/main' into 733-public-api-enum-names

parents dce123ee 77151658

apps/decoder.c

+3 −2
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ int main( 


        if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {
@@ -707,7 +707,7 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );

                goto cleanup;

            }

            renderConfig.room_acoustics.override = true;

            renderConfig.roomAcoustics.override = true;

        }



        if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
@@ -716,6 +716,7 @@ int main( 
            goto cleanup;

        }

    }



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

     * Load custom loudspeaker layout data

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

apps/renderer.c

+2 −2
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ int main( 


        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.room_acoustics ) ) == IVAS_ERR_OK )

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {
@@ -1081,7 +1081,7 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );

                exit( -1 );

            }

            renderConfig.room_acoustics.override = 1;

            renderConfig.roomAcoustics.override = 1;

        }



        if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ typedef struct _IVAS_RENDER_CONFIG 
#ifdef DEBUGGING

    IVAS_RENDER_TYPE_OVERRIDE renderer_type_override;

#endif

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA room_acoustics;

    IVAS_ROOM_ACOUSTICS_CONFIG_DATA roomAcoustics;

#ifdef SPLIT_REND_WITH_HEAD_ROT

    IVAS_SPLIT_REND_CONFIG_DATA split_rend_config;

#endif

lib_com/ivas_cnst.h

+17 −15
Original line number Diff line number Diff line
@@ -121,15 +121,6 @@ typedef enum 
    RENDERER_OSBA_LS

} RENDERER_TYPE;



#ifdef DEBUGGING

typedef enum

{

    RENDER_TYPE_OVERRIDE_NONE,

    RENDER_TYPE_OVERRIDE_CREND,

    RENDER_TYPE_OVERRIDE_FASTCONV

} ivas_renderTypeOverride;

#endif



#if defined SPLIT_REND_WITH_HEAD_ROT

typedef enum

{
@@ -162,7 +153,11 @@ typedef enum 
#define MAX_SCE                                 MAX_NUM_OBJECTS             /* max. number of SCEs */

#define MAX_CPE                                 ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS )    /* max. number of CPEs */



#ifdef FIX_747_ISM_TODOS

#define MAX_BITS_METADATA                       2500                        /* max. bit-budget of metadata */

#else

#define MAX_BITS_METADATA                       2640                        /* max. bit-budget of metadata, one channel */ /* IVAS_fmToDo: to be confirmed for final value once mature */

#endif

#define MIN_NUM_IND                             10                          /* minimum number of indices in the core coder */

#define MAX_NUM_IND_LFE                         100                         /* maximum number of indices in the LFE encoder */

#define MAX_NUM_IND_TEMP_LIST                   10                          /* maximum number of indices in the temporary list */
@@ -369,8 +364,9 @@ typedef enum 
#define ISM_Q_STEP_LOW                          (ISM_Q_STEP * 2)

#define ISM_Q_STEP_BORDER_LOW                   (ISM_Q_STEP_BORDER * 2)



#ifndef FIX_747_ISM_TODOS

#define BRATE_ISM_INACTIVE                      2450 /* CoreCoder bitrate in ISM inactive frames */



#endif

typedef enum 

{

    ISM_MODE_NONE,
@@ -405,10 +401,16 @@ enum 
    IND_ISM_ELEVATION = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS = TAG_ISM_LOOP_START,

#ifdef FIX_747_ISM_TODOS

    TAG_ISM_LOOP_END = TAG_ISM_LOOP_START

#else

    TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */

#endif

    /* --------- end of loop for objects ----------- */



#ifndef FIX_747_ISM_TODOS

    ISM_MAX_NUM_INDICES

#endif



};

lib_com/ivas_dirac_com.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ ivas_error ivas_dirac_config( 


        if ( hQMetaData != NULL )

        {

            if ( enc_dec == ENC || ( ivas_format != SBA_FORMAT && ivas_format != SBA_ISM_FORMAT ) ) /* Todo: This condition should probably be corrected in main */

            if ( enc_dec == ENC )

            {

                hConfig->nbands = hQMetaData->q_direction[0].cfg.nbands;

            }