Commit bc25afdc authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into REND_DEBUGGING_REVISION

parents 94eb8e23 a3b28b2a

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -1429,7 +1429,11 @@ static ivas_error decodeG192( 
    ivas_error error = IVAS_ERR_UNKNOWN;

    uint16_t numObj = 0;

    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

#else

    IVAS_POSITION Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

#endif



    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

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

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -536,7 +536,11 @@ int main( 
    int32_t delayTimeScale = 0;

    int16_t i, numChannels;

    ivas_error error = IVAS_ERR_OK;

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];

#else

    IVAS_POSITION Pos[RENDERER_HEAD_POSITIONS_PER_FRAME];

#endif



#ifdef WMOPS

    reset_wmops();

lib_com/common_api_types.h

+4 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define IVAS_MAX_BITS_PER_FRAME     ( 512000 / 50 )

#define IVAS_MAX_NUM_OBJECTS        4

#define IVAS_MAX_OUTPUT_CHANNELS    16

#define IVAS_CLDFB_NO_CHANNELS_MAX  60

#define IVAS_CLDFB_NO_CHANNELS_MAX  ( 60 )

#define IVAS_MAX_INPUT_LFE_CHANNELS 4



#define RENDERER_HEAD_POSITIONS_PER_FRAME 4
@@ -93,11 +93,13 @@ typedef struct 
    float x, y, z;

} IVAS_VECTOR3;



#ifndef FIX_406_IVAS_POSITION

typedef struct

{

    float x, y, z;



} IVAS_POSITION;

#endif



typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

#ifdef FIX_350_MASA_DELAY_COMP
@@ -161,6 +163,7 @@ typedef struct _IVAS_LS_CUSTOM_LAYOUT 


} IVAS_CUSTOM_LS_DATA;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;

typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -165,7 +165,10 @@ 


#define FIX_ISM_DTX_CLICKS                              /* FhG: fix for clicks in ISM DTX for inactive to active TCX transitions */

#define ISSUE_24_CLEANUP_MCT_LFE                        /* Issue 24: Cleanup LFE path withing MCT */

#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */



#define FIX_401_DIRAC_RENDERER_META_READ_INDICES        /* Nokia: Issue 401: Fix metadata reading indices in DirAC renderer. */

#define FIX_406_IVAS_POSITION                           /* Eri: Issue 406: Unify IVAS_POSITION to use IVAS_VECTOR3 instead */

#define REND_DEBUGGING_REVISION                         /* VA: encapsulate rendering debugging options with DEBUGGING */

lib_dec/lib_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -895,7 +895,11 @@ ivas_error IVAS_DEC_GetMasaMetadata( 
ivas_error IVAS_DEC_FeedHeadTrackData(

    IVAS_DEC_HANDLE hIvasDec,     /* i/o: IVAS decoder handle                        */

    IVAS_QUATERNION *orientation, /* i  : head-tracking data, listener orientation   */

#ifdef FIX_406_IVAS_POSITION

    IVAS_VECTOR3 *Pos /* i  : listener position                          */

#else

    IVAS_POSITION *Pos /* i  : listener position                          */

#endif

)

{

    HEAD_TRACK_DATA_HANDLE hHeadTrackData;
@@ -999,7 +1003,7 @@ ivas_error IVAS_DEC_FeedCustomLsData( 
)

{

    int16_t i, is_planar;

    IVAS_LSSETUP_CUSTOM_STRUCT *hLsSetupCustom;

    IVAS_LSSETUP_CUSTOM_HANDLE hLsSetupCustom;



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {