Commit c30db7cc authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Fix for 3GPP issue 1348: Increased noise level in BASOP decoder for... 

Fix for 3GPP issue 1348: Increased noise level in BASOP decoder for band-limited input from float encoder
Link #1348
parent b7437cd5

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -69,6 +69,5 @@ 


/* Note: each compile switch (FIX_1101_...) is independent from the other ones */

//#define OPT_STEREO_32KBPS_V1                    /* Optimization made in stereo decoding path for 32kbps decoding */

#define FIX_1310_SPEEDUP_ivas_dirac_dec_get_response_fx                 /*FhG: WMOPS tuning, nonbe*/

#define FIX_1310_SPEEDUP_ivas_dirac_dec_output_synthesis_process_slot   /*FhG: WMOPS tuning, nonbe*/

#define FIX_1348_BIT_PRECISION_IMPROVEMENT

#endif

lib_dec/dec_tcx_fx.c

+78 −1
Original line number Diff line number Diff line
@@ -2601,6 +2601,9 @@ void IMDCT_ivas_fx( 
    const Word16 frame_cnt,

    const Word16 bfi,

    Word16 *old_out_fx, // Q(-2)

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

    Word16 *q_old_out_fx,

#endif

    const Word16 FB_flag,

    Decoder_State *st,

    const Word16 fullbandScale,
@@ -2862,9 +2865,16 @@ void IMDCT_ivas_fx( 
                move16();



                Word16 diff = sub( q_tmp_fx_32, q_win );

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                Word16 q_old_out_diff = sub( q_tmp_fx_32, *q_old_out_fx );

#endif

                FOR( Word16 ind = 0; ind < L_frame; ind++ )

                {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                    old_out_fx_32[ind] = L_shl( old_out_fx[ind], q_old_out_diff );

#else                    

                    old_out_fx_32[ind] = L_shl( old_out_fx[ind], diff );

#endif

                    move32();

                }
@@ -2872,7 +2882,11 @@ void IMDCT_ivas_fx( 


                FOR( Word16 ind = 0; ind < L_frame; ind++ )

                {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                    old_out_fx[ind] = extract_l( L_shr( old_out_fx_32[ind], q_old_out_diff ) );

#else

                    old_out_fx[ind] = extract_l( L_shr( old_out_fx_32[ind], diff ) );

#endif

                    xn_buf_fx[ind] = extract_l( L_shr( xn_buf_fx_32[ind], diff ) );

                    move16();

                    move16();
@@ -2880,7 +2894,12 @@ void IMDCT_ivas_fx( 
            }

            ELSE

            {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                Scale_sig32( x_fx, L_frame, 1 );

                q_xn_buf_fx_32 ++;

#else

                Word16 q_old_out = q_win;

#endif

                move16();

                edct_fx( x_fx, xn_buf_fx_32 + add( shr( overlap, 1 ), nz ), L_frame, &q_xn_buf_fx_32 );

                Word16 res_m, res_e;
@@ -2904,15 +2923,21 @@ void IMDCT_ivas_fx( 
                    move16();

                }



#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                window_ola_fx( tmp_fx_32, xn_buf_fx, &q_tmp_fx_32, old_out_fx, q_old_out_fx, L_frame, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );

#else

                window_ola_fx( tmp_fx_32, xn_buf_fx, &q_tmp_fx_32, old_out_fx, &q_old_out, L_frame, hTcxCfg->tcx_last_overlap_mode, hTcxCfg->tcx_curr_overlap_mode, 0, 0, NULL );



                q_diff = sub( q_old_out, q_win );

#endif



                Word16 diff = sub( q_tmp_fx_32, q_win );

                FOR( Word16 ind = 0; ind < L_frame; ind++ )

                {

#ifndef FIX_1348_BIT_PRECISION_IMPROVEMENT

                    old_out_fx[ind] = shr_sat( old_out_fx[ind], q_diff );

                    move16();

#endif

                    xn_buf_fx[ind] = shr_sat( xn_buf_fx[ind], diff );

                    move16();

                }
@@ -3004,9 +3029,18 @@ void IMDCT_ivas_fx( 


            IF( hTcxCfg->last_aldo != 0 )

            {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                Word16 tmp_old_out;

                Word16 q_diff = sub( *q_old_out_fx, q_win );

#endif

                FOR( i = 0; i < sub( overlap, tcx_mdct_window_min_length ); i++ )

                {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                    tmp_old_out = shr_sat( old_out_fx[( i + nz )], q_diff );

                    xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )], tmp_old_out ); // Q(-2)

#else

                    xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )], old_out_fx[( i + nz )] ); // Q(-2)

#endif

                    move16();

                }
@@ -3019,17 +3053,32 @@ void IMDCT_ivas_fx( 
                    // tested

                    FOR( ; i < overlap; i++ ) /* perfectly reconstructing ALDO shortening */

                    {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                        tmp_old_out = shr_sat( old_out_fx[( i + nz )], q_diff );

                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], tmp_old_out ); // Q(-2)

#else

                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], old_out_fx[( i + nz )] ); // Q(-2)

#endif

                        move16();

                    }

                    FOR( i = 0; i < ( tcx_mdct_window_min_length / 2 ); i++ )

                    {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                        tmp_old_out = shr_sat( old_out_fx[( ( i + nz ) + overlap )], q_diff );

                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( tmp_old_out, tcx_mdct_window_minimum_fx[i].v.re ) ); // Q(-2)

#else

                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[i].v.re ) ); // Q(-2)

#endif

                        move16();

                    }

                    FOR( ; i < tcx_mdct_window_min_length; i++ )

                    {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                        tmp_old_out = shr_sat( old_out_fx[( ( i + nz ) + overlap )], q_diff );

                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( tmp_old_out, tcx_mdct_window_minimum_fx[( tcx_mdct_window_min_length - ( 1 + i ) )].v.im ) ); // Q(-2)

#else

                        xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )] = add_sat( xn_buf_fx[( ( ( i + ( overlap / 2 ) ) - tcx_offset ) + overlap )], mult_r( old_out_fx[( ( i + nz ) + overlap )], tcx_mdct_window_minimum_fx[( tcx_mdct_window_min_length - ( 1 + i ) )].v.im ) ); // Q(-2)

#endif

                        move16();

                    }

                }
@@ -3037,12 +3086,22 @@ void IMDCT_ivas_fx( 
                {

                    FOR( ; i < ( overlap - ( tcx_mdct_window_min_length / 2 ) ); i++ )

                    {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                        tmp_old_out = shr_sat( old_out_fx[( i + nz )], q_diff );

                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( tmp_old_out, tcx_mdct_window_minimum_fx[( ( tcx_mdct_window_min_length - overlap ) + i )].v.re ) ); // Q(-2)

#else

                        xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( ( tcx_mdct_window_min_length - overlap ) + i )].v.re ) ); // Q(-2)

#endif

                        move16();

                    }

                    FOR( ; i < overlap; i++ )

                    {

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                        tmp_old_out = shr_sat( old_out_fx[( i + nz )], q_diff );

                        xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( tmp_old_out, tcx_mdct_window_minimum_fx[( overlap - ( 1 + i ) )].v.im ) ); // Q(-2)

#else

                        xn_buf_fx[( i + ( ( overlap / 2 ) - tcx_offset ) )] = add_sat( xn_buf_fx[( ( i + ( overlap / 2 ) ) - tcx_offset )], mult_r( old_out_fx[( i + nz )], tcx_mdct_window_minimum_fx[( overlap - ( 1 + i ) )].v.im ) ); // Q(-2)

#endif

                        move16();

                    }

                }
@@ -3091,7 +3150,9 @@ void IMDCT_ivas_fx( 
        /* Compute windowed synthesis in case of switching to ALDO windows in next frame */

        Copy( xn_buf_fx + sub( L_frame, nz ), old_out_fx, add( nz, overlap ) );

        set16_fx( old_out_fx + add( nz, overlap ), 0, nz );



#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

        *q_old_out_fx = q_win;

#endif

        tcx_windowing_synthesis_past_frame( old_out_fx + nz, tcx_aldo_window_1_trunc_fx, tcx_mdct_window_half_fx, tcx_mdct_window_minimum_fx, overlap, tcx_mdct_window_half_length, tcx_mdct_window_min_length, hTcxCfg->tcx_curr_overlap_mode );



        /* If current overlap mode = FULL_OVERLAP -> ALDO_WINDOW */
@@ -5196,7 +5257,11 @@ void decoder_tcx_imdct_fx( 


        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2,

                       hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, &st->hHQ_core->q_old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );

#else

                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );

#endif

    }



    /* Generate additional comfort noise to mask potential coding artefacts */
@@ -5218,7 +5283,11 @@ void decoder_tcx_imdct_fx( 
        Copy32( x_fx, xn_bufFB_fx, s_max( L_spec, s_max( L_frame, L_frameTCX ) ) ); // q_x



        IMDCT_ivas_fx( xn_bufFB_fx, q_x, hTcxDec->syn_Overl, hTcxDec->syn_Overl_TDAC, xn_buf_fx, hTcxCfg->tcx_aldo_window_1, hTcxCfg->tcx_aldo_window_1_trunc, hTcxCfg->tcx_aldo_window_2, hTcxCfg->tcx_mdct_window_half, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_half_length, hTcxCfg->tcx_mdct_window_min_length, index,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, &st->hHQ_core->q_old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );

#else

                       kernelType, left_rect, tcx_offset, overlap, L_frame, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frame_glob, frame_cnt, bfi, st->hHQ_core->old_out_LB_fx, 0, st, 0, acelp_zir_fx, q_win );

#endif

    }



    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )
@@ -5235,13 +5304,21 @@ void decoder_tcx_imdct_fx( 
    {

        IMDCT_ivas_fx( x_tmp_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB,

                       hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, &st->hHQ_core->q_old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );

#else

                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );

#endif

    }

    ELSE

    {



        IMDCT_ivas_fx( x_fx, q_x, hTcxDec->syn_OverlFB, hTcxDec->syn_Overl_TDACFB, xn_bufFB_fx_16, hTcxCfg->tcx_aldo_window_1_FB, hTcxCfg->tcx_aldo_window_1_FB_trunc, hTcxCfg->tcx_aldo_window_2_FB, hTcxCfg->tcx_mdct_window_halfFB, hTcxCfg->tcx_mdct_window_minimumFB, hTcxCfg->tcx_mdct_window_transFB, hTcxCfg->tcx_mdct_window_half_lengthFB, hTcxCfg->tcx_mdct_window_min_lengthFB, index,

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, &st->hHQ_core->q_old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );

#else

                       kernelType, left_rect, tcx_offsetFB, overlapFB, L_frameTCX, L_frameTCX, shr( s_max( L_frameTCX, L_spec ), 1 ), L_frameTCX_glob, frame_cnt, bfi, st->hHQ_core->old_out_fx, 1, st, ratio, acelp_zir_fx, q_win );

#endif

    }

    FOR( Word16 ind = 0; ind < L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX; ind++ )

    {

lib_dec/hq_core_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,10 @@ void HQ_core_dec_init_fx( 
    hHQ_core->Q_old_wtda = 15;

    hHQ_core->Q_old_postdec = 0;

    hHQ_core->Q_old_wtda_LB = 0;

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

    hHQ_core->q_old_out_fx = 0;

    hHQ_core->q_old_out_LB_fx = 0;

#endif

    move16();

    move16();

    move16();

lib_dec/ivas_mdct_core_dec_fx.c

+12 −0
Original line number Diff line number Diff line
@@ -1098,7 +1098,11 @@ void ivas_mdct_core_reconstruct_fx( 
    Word16 *synthFB_fx;

    Word16 q_syn = 0;

    move16();

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

    Word16 q_win = -1;

#else

    Word16 q_win = -2;

#endif

    move16();

    /* TCX */

    Word16 xn_buf_fx[L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX]; // Q(-2)
@@ -1174,8 +1178,10 @@ void ivas_mdct_core_reconstruct_fx( 
            st->hTcxDec->Q_old_syn_Overl = q_win;

            Scale_sig( st->hTcxDec->syn_Overl, L_FRAME32k / 2, sub( q_win, st->Q_syn ) );                                  // Q(st->Q_syn) -> q_win

            Scale_sig( st->hTcxDec->syn_OverlFB, L_FRAME_MAX / 2, sub( q_win, st->Q_syn ) );                               // Q(st->Q_syn) -> q_win

#ifndef FIX_1348_BIT_PRECISION_IMPROVEMENT

            Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( q_win, st->hHQ_core->Q_old_wtda_LB ) );               // Q(st->hHQ_core->Q_old_wtda_LB) -> q_win

            Scale_sig( st->hHQ_core->old_out_fx, L_FRAME48k, sub( q_win, st->hHQ_core->Q_old_wtda ) );                     // Q(st->hHQ_core->Q_old_wtda) -> q_win

#endif

            Scale_sig( synth_buf_fx, add( add( st->hTcxDec->old_synth_len, L_FRAME_PLUS ), M ), sub( q_win, q_syn ) );     // q_syn -> q_win

            Scale_sig( synth_bufFB_fx, add( add( st->hTcxDec->old_synth_lenFB, L_FRAME_PLUS ), M ), sub( q_win, q_syn ) ); // q_syn -> q_win

            Scale_sig( st->syn, M + 1, sub( q_win, st->Q_syn ) );                                                          // st->Q_syn -> q_win
@@ -1206,6 +1212,10 @@ void ivas_mdct_core_reconstruct_fx( 
                    /* Note: these buffers are not subframe-based, hence no indexing with k */

                    set16_fx( &st->hHQ_core->old_out_LB_fx[0], 0, L_frame[ch] );

                    set16_fx( &st->hHQ_core->old_out_fx[0], 0, L_frameTCX[ch] );

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT

                    st->hHQ_core->q_old_out_LB_fx = 0;                    

                    st->hHQ_core->q_old_out_fx = 0;

#endif

                    set16_fx( &st->hTcxDec->syn_Overl[0], 0, shr( L_frame[ch], 1 ) );

                    set16_fx( &st->hTcxDec->syn_OverlFB[0], 0, shr( L_frameTCX[ch], 1 ) );

                    set16_fx( &st->hTcxDec->syn_Overl_TDAC[0], 0, shr( L_frame[ch], 1 ) );
@@ -1246,8 +1256,10 @@ void ivas_mdct_core_reconstruct_fx( 
            Scale_sig( st->syn, M + 1, add( st->Q_syn, 2 ) );

            Scale_sig( st->hTcxDec->syn_OverlFB, L_FRAME_MAX / 2, sub( st->Q_syn, q_win ) ); // q_win -> st->Q_syn

            Scale_sig( st->hTcxDec->syn_Overl, L_FRAME32k / 2, sub( st->Q_syn, q_win ) );    // q_win -> st->Q_syn

#ifndef FIX_1348_BIT_PRECISION_IMPROVEMENT

            Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( st->Q_syn, q_win ) );   // q_win -> st->Q_syn

            Scale_sig( st->hHQ_core->old_out_fx, L_FRAME48k, sub( st->Q_syn, q_win ) );      // q_win -> st->Q_syn

#endif

            st->hHQ_core->Q_old_wtda = st->Q_syn;

            move16();

            st->hHQ_core->Q_old_wtda_LB = st->Q_syn;

lib_dec/stat_dec.h

+4 −0
Original line number Diff line number Diff line
@@ -702,6 +702,10 @@ typedef struct hq_dec_structure 
    Word16 exp_old_out;

    Word16 old_out_LB_fx[L_FRAME32k]; /* HQ core - previous synthesis for OLA for Low Band */

    Word32 old_out_LB_fx32[L_FRAME32k];

#ifdef FIX_1348_BIT_PRECISION_IMPROVEMENT    

    Word16 q_old_out_LB_fx;

    Word16 q_old_out_fx;

#endif

    Word16 q_old_outLB_fx;

    Word16 Q_old_wtda_LB;

    Word16 Q_old_wtda;