Commit f63e97ae authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Testing for issue 948

parent 67436547

lib_dec/ivas_decision_matrix_dec.c

+8 −5
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ void ivas_decision_matrix_dec_fx( 
    test();

    test();

    test();

    IF( ( st->idchan == 0 && ( EQ_32( st->total_brate, FRAME_NO_DATA ) || EQ_32( st->total_brate, SID_2k40 ) ) ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LE_32( st->total_brate, SID_2k40 ) ) )

    IF( ( st->idchan == 0 && ( ( st->total_brate == FRAME_NO_DATA ) || EQ_32( st->total_brate, SID_2k40 ) ) ) || ( EQ_16( st->element_mode, IVAS_CPE_MDCT ) && LE_32( st->total_brate, SID_2k40 ) ) )

    {

        st->core = ACELP_CORE;

        move16();
@@ -578,7 +578,7 @@ void ivas_decision_matrix_dec_fx( 
        test();

        test();

        test();

        if ( EQ_32( st->total_brate, FRAME_NO_DATA ) && st->prev_bfi && !st->bfi && GT_16( st->L_frame, L_FRAME16k ) )

        if ( ( st->total_brate == FRAME_NO_DATA ) && st->prev_bfi && !st->bfi && GT_16( st->L_frame, L_FRAME16k ) )

        {

            st->L_frame = st->last_CNG_L_frame;

            move16();
@@ -654,6 +654,7 @@ void ivas_decision_matrix_dec_fx( 
        {

            *sharpFlag = 0;

            move16();

            test();

            if ( EQ_16( st->coder_type, GENERIC ) || EQ_16( st->coder_type, VOICED ) )

            {

                *sharpFlag = 1;
@@ -678,6 +679,7 @@ void ivas_decision_matrix_dec_fx( 
            IF( LT_32( element_brate, FRMT_SHP_MIN_BRATE_IVAS ) )

            {

                st->coder_type = get_next_indice_fx( st, 3 );

                move16();

                *sharpFlag = 0;

                move16();
@@ -694,9 +696,10 @@ void ivas_decision_matrix_dec_fx( 
            {

                /* get coder_type info */

                st->coder_type = get_next_indice_fx( st, 3 );



                move16();

                /* get sharpening flag */

                *sharpFlag = get_next_indice_fx( st, 1 );

                move16();

            }

        }

    }
@@ -785,7 +788,7 @@ void ivas_decision_matrix_dec_fx( 
                ELSE

                {

                    st->extl = SWB_TBE;

                    move32();

                    move16();

                    st->extl_brate = SWB_TBE_1k6;

                    move32();

                    test();
@@ -878,7 +881,7 @@ void ivas_decision_matrix_dec_fx( 
            test();

            test();

            test();

            if ( GE_16( st->element_mode, IVAS_CPE_DFT ) && EQ_16( st->core, ACELP_CORE ) && ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && !( EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) )

            if ( GE_16( st->element_mode, IVAS_CPE_DFT ) && ( st->core == ACELP_CORE ) && ( EQ_16( st->extl, SWB_TBE ) || EQ_16( st->extl, FB_TBE ) ) && !( EQ_16( st->element_mode, IVAS_CPE_TD ) && st->tdm_LRTD_flag ) )

            {

                icbwe_brate = L_add( icbwe_brate, STEREO_ICBWE_MSFLAG_BITS * FRAMES_PER_SEC );

            }

lib_dec/ivas_dirac_dec.c

+225 −180

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_dirac_output_synthesis_cov.c

+107 −99

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_mct_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ ivas_error ivas_mct_dec_fx( 
        hdrm = getScaleFactor16( synth_fx[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX );

        IF( hdrm != 0 )

        {

            sh = s_min( sub( e_sig[0], 15 ), hdrm );

            sh = s_min( sub( e_sig[0], 16 ), hdrm );

            Scale_sig( synth_fx[0], hCPE->hCoreCoder[0]->hTcxDec->L_frameTCX, sh );

            e_sig[0] = sub( e_sig[0], sh );

            move16();
@@ -587,7 +587,7 @@ ivas_error ivas_mct_dec_fx( 


        IF( hdrm != 0 )

        {

            sh = s_min( sub( e_sig[1], 15 ), hdrm );

            sh = s_min( sub( e_sig[1], 16 ), hdrm );

            Scale_sig( synth_fx[1], hCPE->hCoreCoder[1]->hTcxDec->L_frameTCX, sh );

            e_sig[1] = sub( e_sig[1], sh );

            move16();
@@ -620,7 +620,7 @@ ivas_error ivas_mct_dec_fx( 
                Copy_Scale_sig_16_32( hCPE->hCoreCoder[n]->hHQ_core->old_out_fx, hCPE->hCoreCoder[n]->hHQ_core->oldOut_fx, output_frame, sub( Q11, hCPE->hCoreCoder[n]->hHQ_core->Q_old_wtda ) );

                ivas_post_proc_fx( NULL, hCPE, n, synth_fx_32[n], NULL, output_frame, 1, Q11 );

#ifdef MSAN_FIX

                Copy_Scale_sig_32_16( synth_fx_32[n], synth_fx[n], output_frame, 0 - Q11 ); // Q0

                Copy_Scale_sig_32_16( synth_fx_32[n], synth_fx[n], output_frame, -1 - Q11 ); // Q0

#else

                Copy_Scale_sig_32_16( synth_fx_32[n], synth_fx[n], L_FRAME48k, 0 - Q11 );

#endif
@@ -630,7 +630,7 @@ ivas_error ivas_mct_dec_fx( 
            Word16 output_mem_fx[L_FRAME48k];

            IF( hCPE->output_mem_fx[1] != NULL )

            {

                Copy_Scale_sig_32_16( hCPE->output_mem_fx[1], output_mem_fx, NS2SA( sts[n]->output_Fs, 3125000 ), 0 - Q11 );

                Copy_Scale_sig_32_16( hCPE->output_mem_fx[1], output_mem_fx, NS2SA( sts[n]->output_Fs, 3125000 ), -1 - Q11 );

            }

            ELSE

            {