Commit f761cba7 authored by Vidhya V P's avatar Vidhya V P
Browse files

Merge branch 'main' into 391-head-rotation-crashes-in-bitrate-switching-SBA

parents 6d00944f d88924e2

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 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
#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_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) */
@@ -179,6 +180,8 @@ 
#define LBR_ADAP_SMOOTHING

#endif

#define FIX_391_SBA                                     /* Dlb: Fix for issue 391 for SBA */



#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_dec/ivas_ism_dtx_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ ivas_error ivas_ism_dtx_dec( 
            st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream;

            st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */

            st->cng_ism_flag = 1;

            st->L_frame = min( st->L_frame, L_FRAME16k ); /* note: needed for switching from active frame with L_frame=640 to CNG in object with no SID */

#else

            ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content

#endif

lib_dec/ivas_mc_param_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,9 @@ void ivas_param_mc_dec_read_BS( 
        /* for PLC, use the saved ILDs and ICCs from the past and set the transient flag and transient position to zero */

        hMetadataPMC->bAttackPresent = 0;

        hMetadataPMC->attackIndex = 0;

#ifdef FIX_431_PARAMMC_PLC_INTERPOLATOR

        param_mc_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator );

#endif

    }



    pop_wmops();

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;

}