Commit 9831500b authored by vaclav's avatar vaclav
Browse files

fix build

parent ad1e4fd1

lib_rend/lib_rend.c

+156 −179
Original line number Diff line number Diff line
@@ -5149,12 +5149,7 @@ ivas_error IVAS_REND_FeedSplitBinauralBitstream( 
 *-------------------------------------------------------------------*/



ivas_error IVAS_REND_SetHeadRotation(

<<<<<<< HEAD

    IVAS_REND_HANDLE hIvasRend,                                       /* i/o: Renderer handle                        */

#ifdef API_5MS

=======

    IVAS_REND_HANDLE hIvasRend,    /* i/o: Renderer handle                        */

>>>>>>> a6c09e4c8d628f3c9736959442e9006de7e24052

    const IVAS_QUATERNION headRot, /* i  : head orientations for next rendering call  */

    const IVAS_VECTOR3 Pos         /* i  : listener positions for next rendering call */

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -5360,10 +5355,6 @@ ivas_error IVAS_REND_SetReferenceVector( 
ivas_error IVAS_REND_SetExternalOrientation(

    IVAS_REND_HANDLE hIvasRend,           /* i/o: Renderer handle                                                         */

    IVAS_QUATERNION *orientation,         /* i  : external orientation data                                               */

<<<<<<< HEAD

#ifdef API_5MS

=======

>>>>>>> a6c09e4c8d628f3c9736959442e9006de7e24052

    int8_t enableHeadRotation,            /* i  : flag to enable head rotation for this frame                             */

    int8_t enableExternalOrientation,     /* i  : flag to enable external orientation for this frame                      */

    int8_t enableRotationInterpolation,   /* i  : flag to interpolate rotations from current and previous frames          */
@@ -5544,15 +5535,7 @@ static ivas_error chooseCrossfade( const IVAS_REND_HeadRotData *headRotData, con 
static ivas_error rotateFrameMc(

    IVAS_REND_AudioBuffer inAudio,                               /* i  : Input Audio buffer               */

    AUDIO_CONFIG inConfig,                                       /* i  : Input Audio config               */

<<<<<<< HEAD

#ifdef API_5MS

    const LSSETUP_CUSTOM_STRUCT *pInCustomLs,                    /* i  : Input Custom LS setup            */

#else

    LSSETUP_CUSTOM_STRUCT inCustomLs,                            /* i  : Input Custom LS setup            */

#endif

=======

    const LSSETUP_CUSTOM_STRUCT *pInCustomLs,                    /* i  : Input Custom LS setup            */

>>>>>>> a6c09e4c8d628f3c9736959442e9006de7e24052

    const IVAS_REND_HeadRotData *headRotData,                    /* i  : Head rotation data               */

    const COMBINED_ORIENTATION_HANDLE *hCombinedOrientationData, /* i  : Combined head and external orientations */

    rotation_gains gains_prev,                                   /* i/o: Previous frame rotation gains    */
@@ -7422,9 +7405,7 @@ static ivas_error renderSplitBinauralWithPostRot( 
                            return error;

                        }

#ifdef API_5MS

=======

                        {

                            return error;

                        == == == = { return error;

                    }

>>>>>>> a6c09e4c8d628f3c9736959442e9006de7e24052

                    /* cache the remaining 15ms */
@@ -7496,8 +7477,7 @@ static ivas_error renderSplitBinauralWithPostRot( 
for ( sf_idx = 0; sf_idx < pCombinedOrientationData->num_subframes; sf_idx++ )

{

<<<<<<< HEAD

#endif

        if ( bits.pose_correction == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE && isPostRendInputCldfb )

#endif if ( bits.pose_correction == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE && isPostRendInputCldfb )

    {

        /* 0DOF with LCLD codec requires CLDFB synthesis */

        int16_t ch_idx, slot_idx;
@@ -7519,8 +7499,7 @@ static ivas_error renderSplitBinauralWithPostRot( 


                    for ( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES; slot_idx++ )

<<<<<<< HEAD

#else

                float *RealBuffer[CLDFB_NO_COL_MAX];

#else float *RealBuffer[CLDFB_NO_COL_MAX];

                    float *ImagBuffer[CLDFB_NO_COL_MAX];



                    for ( slot_idx = 0; slot_idx < CLDFB_NO_COL_MAX; slot_idx++ )
@@ -7534,9 +7513,7 @@ static ivas_error renderSplitBinauralWithPostRot( 
                ImagBuffer[slot_idx] = Cldfb_ImagBuffer_Binaural[ch_idx][slot_idx];

#endif

                    }

=======

                    {

                        RealBuffer[slot_idx] = Cldfb_RealBuffer_Binaural_5ms[sf_idx][ch_idx][slot_idx];

                    == == == = { RealBuffer[slot_idx] = Cldfb_RealBuffer_Binaural_5ms[sf_idx][ch_idx][slot_idx];

                    ImagBuffer[slot_idx] = Cldfb_ImagBuffer_Binaural_5ms[sf_idx][ch_idx][slot_idx];

                }

>>>>>>> a6c09e4c8d628f3c9736959442e9006de7e24052