Commit bafc15db authored by emerit's avatar emerit
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec

parents 85e7c329 e1f7d3f0

lib_com/disclaimer.c

+2 −0
Original line number Diff line number Diff line
@@ -55,3 +55,5 @@ int16_t print_disclaimer( FILE *fPtr ) 


    return 0;

}



#undef WMC_TOOL_SKIP

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -166,9 +166,8 @@ 
#define FIX_SP2A                                        /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */

#define FIX_413_SBA_DTX                                 /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/

#define FIX_417_TD_DECORR_BRATE_SW                      /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */

#define FIX_427_MAXIMUM_S_INDEX                         /* VA: issue 427: fix return index of function maximum_s() */

#define FIX_431_PARAMMC_PLC_INTERPOLATOR                /* FhG: Issue 431: fix missing interpolator reset for ParamMC PCL */





#define LBR_SBA                                         /* Contribution 47: Master macro for low bitrate SBA (SPAR+DirAC) */

#ifdef LBR_SBA

#define LBR_SBA_BR_SWITCHING                            /* Clean up changes for SBA bitrate switching */
@@ -179,6 +178,8 @@ 
/*#define LBR_SBA_PLANAR*/                              /* Converting low bitrate SBA modes to Planar */

#define LBR_ADAP_SMOOTHING

#endif

#define EUALER2QUAT_FIX                                 /*Dlb :fix for issue 430 issue in euler2quat, sign of quat y is inverted*/



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

/* clang-format on */

#endif

lib_com/tools.c

+3 −0
Original line number Diff line number Diff line
@@ -553,6 +553,9 @@ int16_t maximum_s( 
    {

        if ( vec[i] > tmp )

        {

#ifdef FIX_427_MAXIMUM_S_INDEX

            ind = i;

#endif

            tmp = vec[i];

        }

    }

lib_rend/ivas_rotation.c

+11 −1
Original line number Diff line number Diff line
@@ -165,14 +165,24 @@ void Euler2Quat( 
    float cr = cosf( roll * 0.5f );

    float sr = sinf( roll * 0.5f );

    float cp = cosf( pitch * 0.5f );

#ifdef EUALER2QUAT_FIX

    float sp = sinf( pitch * 0.5f );

#else

    float sp = sinf( -pitch * 0.5f );

#endif

    float cy = cosf( yaw * 0.5f );

    float sy = sinf( yaw * 0.5f );



#ifdef EUALER2QUAT_FIX

    quat->w = cr * cp * cy + sr * sp * sy;

    quat->x = sr * cp * cy - cr * sp * sy;

    quat->y = sr * cp * sy + cr * sp * cy;

    quat->z = cr * cp * sy - sr * sp * cy;

#else

    quat->w = cr * cp * cy - sr * sp * sy;

    quat->x = sr * cp * cy + cr * sp * sy;

    quat->y = cr * sp * cy - sr * cp * sy;

    quat->z = cr * cp * sy + sr * sp * cy;

#endif



    return;

}

scripts/prepare_mem_dryrun.py

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ for d in dirs: 
            with open(fileIn, 'r') as f_in:

                lines = f_in.readlines()

            with open(fileIn, 'w') as f_out:

                skip = 0

                for line in lines:

                    if re.search(r'#define\W+WMC_TOOL_SKIP', line):

                        skip = 1