Commit 06e00488 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

rotation matrix q factor setting to Q30

parent afde1c1e

lib_com/options.h

+11 −5
Original line number Diff line number Diff line
@@ -125,11 +125,6 @@ 
#define FIX_ISSUE_1187                          /* Ittiam: Fix for issue 1187: Assertion error observed in evs_enc_fx (with option stereo_dmx_evs) from bass_pf_enc_fx function*/

#define FIX_ISSUE_1186                          /* Ittiam: Fix for Issue 1186: Energy/scaling issue for ISM-1 at all bitrates */

#define FIX_ISSUE_1165                          /* Ittiam: Fix for issue 1165: Assertion in lpc2lsp_fx for OMASA LTV input */

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

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif

#define FIX_ISSUE_1185                          /* Ittiam: Fix for issue 1185: Assertion in ivas_dirac_dec_binaural_internal_fx() for crash in decoder in fft30_with_cmplx_data()*/

#define FIX_ISSUE_1209                          /* Ittiam: Fix for issue 1209: Assertion exit in BASOP encoder (stereo_dmx_evs)*/

#define FIX_ISSUE_1218                          /* Ittiam: Fix for issue 1218: Assert in stereo_dft_generate_comfort_noise_fx of BASOP decoder with BASOP MASA DTX bitstream at 32 kbps*/
@@ -169,4 +164,15 @@ 
#define FIX_ISSUE_1247

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_1285_DECODER_CRASH



/* #################### Start BASOP porting switches ############################ */



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

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif



/* #################### End BASOP porting switches ############################ */



#endif

lib_isar/isar_splitRendererPre.c

+2 −2
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static void isar_split_rend_quant_md_fx( 
            {

                FOR( ch2 = 0; ch2 < BINAURAL_CHANNELS; ch2++ )

                {

                    quant_val = L_sub( hMd->pred_mat_re_fx[ch1][ch2], L_shr_r( ( ch1 == ch2 ) ? ONE_IN_Q31 : 0, sub( Q31, Q_frame ) ) );

                    quant_val = L_sub_sat( hMd->pred_mat_re_fx[ch1][ch2], L_shr_r( ( ch1 == ch2 ) ? ONE_IN_Q31 : 0, sub( Q31, Q_frame ) ) );

                    quant_val = L_min( L_shr_r( ISAR_SPLIT_REND_PRED_MAX_VAL_Q30, sub( Q30, Q_frame ) ), L_max( quant_val, L_shr_r( ISAR_SPLIT_REND_PRED_MIN_VAL_Q30, sub( Q30, Q_frame ) ) ) );

                    hMd->pred_mat_re_idx[ch1][ch2] = (Word16) L_shr_r( Mpy_32_32( onebyquantstep, quant_val ), sub( Q_frame, 5 ) ); // Q25*Q26 = Q20 -> Q16 -> Q0

                }
@@ -972,7 +972,7 @@ static void isar_split_rend_quant_md_fx( 
            {

                for ( ch2 = 0; ch2 < BINAURAL_CHANNELS; ch2++ )

                {

                    quant_val = L_sub( hMd->pred_mat_re_fx[ch1][ch2], L_shr_r( fix_pos_rot_mat[ch1][ch2], sub( Q31, Q_frame ) ) );

                    quant_val = L_sub_sat( hMd->pred_mat_re_fx[ch1][ch2], L_shr_r( fix_pos_rot_mat[ch1][ch2], sub( Q31, Q_frame ) ) );

                    quant_val = L_min( L_shr_r( ISAR_SPLIT_REND_PRED_MAX_VAL_Q30, sub( Q30, Q_frame ) ), L_max( quant_val, L_shr_r( ISAR_SPLIT_REND_PRED_MIN_VAL_Q30, sub( Q30, Q_frame ) ) ) );

                    hMd->pred_mat_re_idx[ch1][ch2] = (Word16) L_shr_r( Mpy_32_32( onebyquantstep, quant_val ), sub( Q_frame, 5 ) ); // Q25*Q26 = Q20 -> Q16 -> Q0

lib_rend/ivas_dirac_dec_binaural_functions.c

+2 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ static void ivas_dirac_dec_binaural_internal_fx( 
                Euler2Quat_fx( deg2rad_fx( Quaternions_rot.x_fx ), deg2rad_fx( Quaternions_rot.y_fx ), deg2rad_fx( Quaternions_rot.z_fx ), &Quaternions_rot );

                modify_Quat_q_fx( &Quaternions_rot, &Quaternions_rot, Quaternions_ref->q_fact );

                QuatToRotMat_fx( Quaternions_rot, Rmat_local );

                modify_Rmat_q_fx( Rmat_local, Rmat_local, sub( shl( Quaternions_ref->q_fact, 1 ), 32 ), Q30 );



                hDiracDecBin = st_ivas->hDiracDecBin[pos_idx];

                assert( hDiracDecBin != NULL && "No DiracDecBin handle for this position" );
@@ -6862,6 +6863,7 @@ static void ivas_masa_ext_rend_parambin_internal_fx( 
                Euler2Quat_fx( deg2rad_fx( Quaternions_rot.x_fx ), deg2rad_fx( Quaternions_rot.y_fx ), deg2rad_fx( Quaternions_rot.z_fx ), &Quaternions_rot );

                modify_Quat_q_fx( &Quaternions_rot, &Quaternions_rot, Quaternions_ref->q_fact );

                QuatToRotMat_fx( Quaternions_rot, Rmat_local );

                modify_Rmat_q_fx( Rmat_local, Rmat_local, sub( shl( Quaternions_ref->q_fact, 1 ), 32 ), Q30 );



                hDiracDecBin = hMasaExtRend->hDiracDecBin[pos_idx];

                assert( hDiracDecBin != NULL && "No DiracDecBin handle for this position" );

lib_rend/lib_rend.c

+2 −0
Original line number Diff line number Diff line
@@ -7272,6 +7272,7 @@ static ivas_error renderMcToSplitBinaural( 


            Copy_Quat_fx( &Quaternions_abs, &combinedOrientationDataLocal.Quaternions[i] );

            QuatToRotMat_fx( combinedOrientationDataLocal.Quaternions[i], combinedOrientationDataLocal.Rmat_fx[i] );

            modify_Rmat_q_fx( combinedOrientationDataLocal.Rmat_fx[i], combinedOrientationDataLocal.Rmat_fx[i], sub( shl( q_fact_orig, 1 ), 32 ), Q30 );

        }



        IF( EQ_32( inConfig, IVAS_AUDIO_CONFIG_LS_CUSTOM ) || EQ_32( inConfig, IVAS_AUDIO_CONFIG_5_1 ) || EQ_32( inConfig, IVAS_AUDIO_CONFIG_7_1 ) )
@@ -7595,6 +7596,7 @@ static ivas_error renderSbaToMultiBinaural( 


            Copy_Quat_fx( &Quaternions_abs, &combinedOrientationDataLocal.Quaternions[i] );

            QuatToRotMat_fx( combinedOrientationDataLocal.Quaternions[i], combinedOrientationDataLocal.Rmat_fx[i] );

            modify_Rmat_q_fx( combinedOrientationDataLocal.Rmat_fx[i], combinedOrientationDataLocal.Rmat_fx[i], sub( shl( q_fact_orig, 1 ), 32 ), Q30 );

        }



        /* copy input for in-place rotation */