Commit cbdd88f4 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] reorganise options.h and rename EUALER2QUAT_FIX to EULER2QUAT_FIX

parent ad5f52b8

lib_com/options.h

+10 −7
Original line number Diff line number Diff line
@@ -175,7 +175,14 @@ 
/* ################## End BE DEVELOPMENT switches ######################### */





#define SPLIT_REND_WITH_HEAD_ROT

/* Fixes for bugs found during split rendering contribution development */

#define REND_STATIC_MEM_OPT                             /* Dlb: Static memory optimisation for external renderer */

#define EULER2QUAT_FIX                                  /* Dlb: Fix for Euler2Quat()/Quat2EulerDegree functions */

#define SBA_CREND_ROT_OPT                               /* Dlb: Optimisation for rotateFrameSba() used for SHD rotations in external renderer */





#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#ifdef SPLIT_REND_WITH_HEAD_ROT



#define FIX_SPLIT_REND_MERGE                            /* Resolving the compilation warnings after splitrenderer main updation */
@@ -206,20 +213,16 @@ 
#define USE_BIT_COUNT_MERGE_COST

#define OPTIMIZE_DPCM_QUANT

#define SPLIT_REND_PLC

#define ROM_TO_RAM                                      /* switch to convert CQMF decoder tables to RAM */

/*CLDFB CODEC SWITCHES -- END*/



#define REND_STATIC_MEM_OPT

#define EUALER2QUAT_FIX

#define SBA_CREND_ROT_OPT



#define ROM_TO_RAM                                      /*switch to convert CQMF decoder tables to RAM*/

#define SPLIT_REND_CLANG_SAN_FIX

#define SPLIT_REND_CLDFB_HUFF_SAN_FIX

#define SPLIT_REND_STACK_OPT



#define SPLIT_REND_LC3PLUS                              /* FhG: split rendering using LC3plus codec */

// #define SPLIT_REND_LC3PLUS_HBR_DBG                      /* Override bitrate per LC3 core */

#endif

#endif /* SPLIT_REND_WITH_HEAD_ROT */



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

/* #################### Start NON-BE CR switches ########################## */

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
    {

        /* check for Euler angle signaling */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifndef EUALER2QUAT_FIX

#ifndef EULER2QUAT_FIX

        /* TODO: temp change until Euler2Quat() is fixed*/

        if ( ( hIvasDec->st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) &&

             ( hIvasDec->st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

lib_rend/ivas_rotation.c

+2 −2
Original line number Diff line number Diff line
@@ -223,11 +223,11 @@ void Quat2EulerDegree( 
{

    if ( quat.w != -3.0 )

    {

#ifdef EUALER2QUAT_FIX

#ifdef EULER2QUAT_FIX

        float p;

#endif

        *yaw = atan2f( 2 * ( quat.w * quat.x + quat.y * quat.z ), 1 - 2 * ( quat.x * quat.x + quat.y * quat.y ) );

#ifdef EUALER2QUAT_FIX

#ifdef EULER2QUAT_FIX

        p = 2 * ( quat.w * quat.y - quat.z * quat.x );

        p = max( -1.0f, min( 1.0f, p ) );

        *pitch = asinf( p );

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -5170,7 +5170,7 @@ ivas_error IVAS_REND_SetHeadRotation( 
                     ( hIvasRend->inputsSplitPost[0].base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||

                     ( hIvasRend->inputsSplitPost[0].base.inConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

                {

#ifndef EUALER2QUAT_FIX

#ifndef EULER2QUAT_FIX

                    rotQuat = headRot[i]; /* TODO: temp change until Euler2Quat() is fixed*/

#else

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