Commit 36854450 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

bad merge fix in disabled code

parent a1c3a12e

lib_dec/lib_dec.c

+2 −5
Original line number Diff line number Diff line
@@ -1739,10 +1739,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
    for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

    {

        /* check for Euler angle signaling */

<<<<<<< HEAD

        == == == =

        if ( orientation[i].w == -3.0f )

>>>>>>> main

        {

            Euler2Quat( deg2rad( orientation[i].x ), deg2rad( orientation[i].y ), deg2rad( orientation[i].z ), &orientation[i] );

        }
@@ -2067,7 +2064,7 @@ static ivas_error copyRendererConfigStruct( RENDER_CONFIG_HANDLE hRCin, IVAS_REN 
    mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->directivity, hRCout->directivity, 3 );

    mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );

#ifdef SPLIT_REND_WITH_HEAD_ROT

    hRCout->split_rend_config.splitRendBitRate = SPLIT_REND_768k;

    hRCout->split_rend_config.dof = 3;