Commit d740ea16 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into 398-masa-direction-field-alignment

parents fb1c11f1 e4226ae3

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

+2 −0
Original line number Diff line number Diff line
@@ -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

lib_com/ivas_prot.h

+6 −2
Original line number Diff line number Diff line
@@ -3543,8 +3543,10 @@ void ivas_dirac_dec_output_synthesis_process_slot( 
    const float *p_Rmat,                                        /* i  : rotation matrix                             */

    const VBAP_HANDLE hVBAPdata,                                /* i  : VBAP structure                              */

    const IVAS_OUTPUT_SETUP hOutSetup,                          /* i  : output setup structure                      */

    const int16_t nchan_transport,                              /* i  : number of transport channels                */

    const int16_t index_slot 

    const int16_t nchan_transport                               /* i  : number of transport channels                */

#ifndef FIX_401_DIRAC_RENDERER_META_READ_INDICES

    , const int16_t index_slot

#endif

);



void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd(
@@ -3597,8 +3599,10 @@ void ivas_dirac_dec_compute_directional_responses( 
    DIRAC_DEC_HANDLE hDirAC,                                    /* i/o: DirAC handle                                    */

    const VBAP_HANDLE hVBAPdata,                                /* i  : VBAP structure                                  */

    const MASA_DECODER_HANDLE hMasa,                            /* i  : MASA decoder structure                          */

#ifndef FIX_401_DIRAC_RENDERER_META_READ_INDICES

    const int16_t direction_idx,                                /* i  : index for direction (azi and ele)               */

    const int16_t subframe_idx,                                 /* i  : subframe index                                  */

#endif

    const float *surCohRatio,

    const int16_t shd_rot_max_order,                            /* i  : split-order rotation method                     */

    const float *p_Rmat                                         /* i  : rotation matrix                                 */

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ 


#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 */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif