Commit 3c4a5580 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'Q_info_dec_renderer_2' into 'main' 

Q information for decoder and renderer files - 2

See merge request !703
parents 67436547 8a552db2

lib_dec/dlpc_stoch_fx.c

+15 −15
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 


void lpc_unquantize_fx(

    Decoder_State *st,

    Word16 *lsf,

    Word16 *lsp,

    Word16 *lsf, /*x2.56*/

    Word16 *lsp, /*Q15*/

    const Word16 m,

    Word16 *param_lpc,

    Word16 *lspmid,

    Word16 *lsfmid,

    Word16 *param_lpc, /*Q0*/

    Word16 *lspmid,    /*Q15*/

    Word16 *lsfmid,    /*x2.56*/

    Word16 coder_type,

    Word16 *LSF_Q_prediction /* o  : LSF prediction mode                     */

    Word16 *LSF_Q_prediction /* o  : LSF prediction mode                     Q0*/

)

{

    Word16 nb_indices, k;
@@ -31,15 +31,15 @@ void lpc_unquantize_fx( 
    nb_indices = 0; /* to avoid compilation warnings */

    move16();



    Copy( st->lsf_old_fx, &lsf[0], m );

    Copy( st->lsp_old_fx, &lsp[0], m );

    Copy( st->lsf_old_fx, &lsf[0], m ); /*x2.56*/

    Copy( st->lsp_old_fx, &lsp[0], m ); /*x2.56*/



    IF( st->lpcQuantization == 0 )

    {

        nb_indices = dlpc_avq_fx( param_lpc, &lsf[m], st->numlpc, st->sr_core );

        nb_indices = dlpc_avq_fx( param_lpc, &lsf[m], st->numlpc, st->sr_core ); /*Q0*/

        FOR( k = 0; k < st->numlpc; k++ )

        {

            E_LPC_lsf_lsp_conversion( &lsf[imult1616( add( k, 1 ), m )], &lsp[imult1616( add( k, 1 ), m )], m );

            E_LPC_lsf_lsp_conversion( &lsf[( ( k + 1 ) * m )], &lsp[( ( k + 1 ) * m )], m ); /*Q15*/

        }

    }

    ELSE IF( EQ_16( st->lpcQuantization, 1 ) )
@@ -76,7 +76,7 @@ void lpc_unquantize_fx( 
            }

        }



        lsf2lsp_fx( &lsf[m], &lsp[m], M, st->sr_core );

        lsf2lsp_fx( &lsf[m], &lsp[m], M, st->sr_core ); /*Q15*/

    }

    ELSE

    {
@@ -87,7 +87,7 @@ void lpc_unquantize_fx( 
    move16();

    FOR( i = nb_indices - 1; i >= 0; i-- )

    {

        st->seed_acelp = extract_l( L_mac0( L_mac0( 13849, shr( st->seed_acelp, 1 ), 31821 ), param_lpc[i], 31821 ) );

        st->seed_acelp = extract_l( L_mac0( L_mac0( 13849 /*Q0*/, shr( st->seed_acelp, 1 ), 31821 /*Q0*/ ), param_lpc[i], 31821 /*Q0*/ ) ); /*Q0*/

    }



    /* Decoded mid-frame isf */
@@ -96,9 +96,9 @@ void lpc_unquantize_fx( 
    test();

    IF( st->lpcQuantization && st->acelp_cfg.midLpc && EQ_16( st->core, ACELP_CORE ) && st->rate_switching_reset == 0 )

    {

        midlsf_dec( &lsf[0], &lsf[m], param_lpc[nb_indices], lsfmid, coder_type, &( st->mid_lsf_int ), st->prev_bfi, st->safety_net );

        reorder_lsf_fx( lsfmid, LSF_GAP_MID_FX, M, st->sr_core );

        lsf2lsp_fx( lsfmid, lspmid, M, st->sr_core );

        midlsf_dec( &lsf[0], &lsf[m], param_lpc[nb_indices], lsfmid, coder_type, &( st->mid_lsf_int ), st->prev_bfi, st->safety_net ); /*3Q12*/

        reorder_lsf_fx( lsfmid, LSF_GAP_MID_FX, M, st->sr_core );                                                                      /*x2.56*/

        lsf2lsp_fx( lsfmid, lspmid, M, st->sr_core );                                                                                  /*Q15*/

    }

lib_dec/er_dec_acelp_fx.c

+117 −117

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/er_dec_tcx_fx.c

+186 −186

File changed.

Preview size limit exceeded, changes collapsed.

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.