Commit 2a8ac141 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'issue_fix_719_720_721_722' into 'main' 

Issue fix: 719, 720, 721 and 722 issue fixes.

See merge request !239
parents c23288ee 1c0b4da0

lib_com/mslvq_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ void deindex_lvq_SHB_fx( 


        /* find idx_leader */

        i = 1;

        WHILE (index >= table_no_cv[i])

        WHILE (index > table_no_cv[i])

        {

            i++;

        }

lib_dec/ivas_stereo_cng_dec.c

+16 −5
Original line number Diff line number Diff line
@@ -1468,11 +1468,22 @@ void stereo_cna_update_params_fx( 
            c_fx = BASOP_Util_Divide3232_Scale((Word32)enrL_fx, (Word32)enrR_fx, &temp_res_q);

            c_q = 15 - temp_res_q + (y_q - x_q);

            

            Word32 one_in_c_q = L_shl(1 , c_q);

            Word32 num_c_fx = L_sub(c_fx, one_in_c_q);

            Word32 denom_c_fx = L_add(c_fx, one_in_c_q);

            Word16 num_c_headroom = norm_l(L_sub(c_fx, one_in_c_q));

            Word16 denom_c_headroom = norm_l(L_add(c_fx, one_in_c_q));

            Word32 one_in_c_q ;

            IF (GT_16( c_q, 31 ) )

            {

              c_q = 31;

              c_fx = L_shr_sat(c_fx, c_q - 31);

              one_in_c_q = ONE_IN_Q31;

            }

            ELSE

            {

              one_in_c_q = L_shl_sat(1, c_q);

            }



            Word32 num_c_fx = L_sub_sat(c_fx, one_in_c_q);

            Word32 denom_c_fx = L_add_sat(c_fx, one_in_c_q);

            Word16 num_c_headroom = norm_l(L_sub_sat(c_fx, one_in_c_q));

            Word16 denom_c_headroom = norm_l(L_add_sat(c_fx, one_in_c_q));

            Word16 min_headroom_left = num_c_headroom < denom_c_headroom ? num_c_headroom : denom_c_headroom;

            temp_res_q = 0;

            c_ILD_fx = BASOP_Util_Divide3232_Scale(L_shl_sat(num_c_fx, min_headroom_left), L_shl_sat(denom_c_fx, min_headroom_left), &temp_res_q);

lib_dec/ivas_stereo_dft_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3097,7 +3097,7 @@ void stereo_dft_dec_sid_coh_fx( 


        FOR( i = 0; i < b; i++ )

        {

            pred_fx = add( pred_fx, mult( ( *pptr_fx++ ), shl( cohBandq_fx[i], 2 ) ) ); /*q-13*/

            pred_fx = add( pred_fx, shl(mult( ( *pptr_fx++ ), cohBandq_fx[i] ), 2) ); /*q-13*/

        }

        /* Weighted intra/inter-frame prediction */

        pred_fx = add( mult( alpha_fx, pred_fx ), mult( sub( 32767, alpha_fx ), coh_fx[b] ) ); /*q-13*/

lib_dec/ivas_stereo_switching_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -4015,13 +4015,13 @@ void stereo_switching_dec( 
            }

            ELSE

            {

                IF( hCPE->hStereoDftDmx->prevTargetGain_fx == ONE_IN_Q29 )

                IF( hCPE->hStereoTCA->prevTargetGain_fx == ONE_IN_Q29 )

                {

                    tmpF_fx = ONE_IN_Q27;

                }

                ELSE

                {

                    Word16 temp_b = (Word16) L_shr( hCPE->hStereoDftDmx->prevTargetGain_fx, 16 );

                    Word16 temp_b = (Word16) L_shr( hCPE->hStereoTCA->prevTargetGain_fx, 16 );

                    Word16 temp_b_q = 2;

                    tmpF_fx = Inv16( temp_b, &temp_b_q );

                    tmpF_fx = L_shl( tmpF_fx, ( 31 - 4 ) - ( 15 - temp_b_q ) );

lib_dec/pit_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ Word16 pit_decode_ivas_fx( /* o : floating pitch value 
                move16();

                move16();

            }

            printf( "function not tested yet\n" );

        }

#endif

        ELSE