Commit f0133098 authored by multrus's avatar multrus
Browse files

fix compilation issues

parent 9f5f49db

lib_com/options.h

+4 −2
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ 
#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

#define FIX_658_SPLIT_REND_MASA                         /*Dlb : Fix for issue 658, uninitialized memory access in MASA in Split rendering 0DOF mode*/

#ifdef SBA_AND_OBJECTS

#define OSBA_SPLIT_RENDERING

#endif

#endif

#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */
@@ -225,7 +228,6 @@ 
#define SBA_AND_OBJECTS

#ifdef SBA_AND_OBJECTS

#define OSBA_BR_SWITCHING

#define OSBA_SPLIT_RENDERING

#endif



#define TD_REND_TUNING_RENAME                           /* Eri: Tuning of TD renderer model as part of contribution 25 and renaming for default HRIR set */

lib_rend/lib_rend.c

+8 −5
Original line number Diff line number Diff line
@@ -60,15 +60,14 @@ 
#define MAX_BUFFER_LENGTH       ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )

#define MAX_CLDFB_BUFFER_LENGTH ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )

#define MAX_BIN_BUFFER_LENGTH   ( MAX_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS )

#else

#define MAX_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )

#endif



#ifdef FIX_194_LFE_DELAY_EXTREND

#define MAX_BIN_DELAY_SAMPLES 50 /* Maximum supported rendering latency for binaural IRs */

#endif



#else

#define MAX_BUFFER_LENGTH ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )

#endif



/* Frame size required when rendering to binaural */

#define BINAURAL_RENDERING_FRAME_SIZE_MS 20
@@ -6490,7 +6489,7 @@ static ivas_error renderLfeToBinaural( 
#ifdef FIX_194_LFE_DELAY_EXTREND

    for ( ear_idx = 0; ear_idx < BINAURAL_CHANNELS; ++ear_idx )

    {

        writePtr = getSmplPtr( outAudio, pose_idx * BINAURAL_CHANNELS + ear_idx, 0 );

        writePtr = getSmplPtr( outAudio, ear_idx, 0 );

        v_add( writePtr, tmpLfeBuffer, writePtr, frame_size );

    }

#else
@@ -8107,6 +8106,7 @@ static void renderMasaToBinaural( 
    copyMasaMetadataToDiracRenderer( &masaInput->masaMetadata, masaInput->decDummy->hSpatParamRendCom );



    ivas_dirac_dec_binaural( masaInput->decDummy, *masaInput->base.ctx.pCombinedOrientationData, tmpBuffer, masaInput->base.inputBuffer.config.numChannels );

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( is_split_rend_mode )

    {

        accumulateCLDFBArrayToBuffer(
@@ -8116,8 +8116,11 @@ static void renderMasaToBinaural( 
    }

    else

    {

#endif

        accumulate2dArrayToBuffer( tmpBuffer, &outAudio );

#ifdef SPLIT_REND_WITH_HEAD_ROT

    }

#endif



    return;

}