Commit 724c34a3 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 408-ism-metadata-not-used-in-python-based-tests

parents 0595bfa3 998c3935

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/options.h

+6 −4
Original line number Diff line number Diff line
@@ -151,12 +151,10 @@ 
#define FIX_382_MASA_META_FRAMING_ASYNC                 /* Nokia: Issue 382: detect potential MASA metadata framing offset */

#define FIX_386_CORECODER_RECONFIG                      /* VA: Issue 386: Resolve ToDo comments in CoreCoder reconfig. */





#define SBA2MONO                                        /* FhG: Issue 365: Adapt processing of SBA mono output to be in line with stereo output (less delay, lower complexity) */

#define FIX_379_EXT_METADATA                            /* Eri: Extended metadata issues */

#define FIX_379_ANGLE                                   /* Eri: Extended metadata issues related to angle structure */





#define NOKIA_PARAMBIN_REQULARIZATION                   /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */

#define NOKIA_ADAPTIVE_BINAURAL_PROTOS                  /* Nokia: Contribution 28: Adaptive binaural prototypes */

#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT              /* Nokia: enable adaptive binaural prototype complexity optimizations */
@@ -166,10 +164,14 @@ 
#define FIX_392_LATE_REVERB                             /* DLB : Issue 392: keep late reverb by default off when output config is not BINAURAL_ROOM*/



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







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

/* clang-format on */

lib_dec/ivas_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -266,7 +266,15 @@ ivas_error ivas_dec( 
                /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                ivas_ism_render( st_ivas, output, output_frame );

            }

#ifdef REND_DEBUGGING_REVISION

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#endif

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

#ifdef NCHAN_ISM_PARAMETER