Commit ce510efb authored by vaillancour's avatar vaillancour
Browse files

removing remaining PMT() and cleaning most of _DIFF_FLOAT_FIX_

parent b29e040c

lib_dec/amr_wb_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ ivas_error amr_wb_dec_fx( 
        Copy( st_fx->hAmrwb_IO->old_Aq_fx, st_fx->hAmrwb_IO->old_Aq_fx + i_mult( 2, M + 1 ), M + 1 ); /*Q12*/

        Copy( st_fx->hAmrwb_IO->old_Aq_fx, st_fx->hAmrwb_IO->old_Aq_fx + i_mult( 3, M + 1 ), M + 1 ); /*Q12*/

    }

    /*End of _DIFF_FLOAT_FIX_*/



    test();

    if ( EQ_16( st_fx->last_bwidth, NB ) && st_fx->ini_frame != 0 )

    {

lib_enc/ACcontextMapping_enc_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ void ACcontextMapping_encode2_no_mem_s17_LC_fx( 


        /* Get context */

        ctx = &c[s_or( p1, p2 )]; /* Q0 */

        /* _DIFF_FLOAT_FIX_  float is using t as UWord16 */

        t = add( *ctx, rateFlag ); /* Q0 */

        if ( GT_16( idx, nt_half ) )

        {

lib_enc/core_enc_2div_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ void core_encode_twodiv_fx( 
                          hTcxEnc->fUseTns[0],

                          st );



        /*_DIFF_FLOAT_FIX_  -> The line below is present in float */

        /*_DIFF_FLOAT_FIX_EVS_IVAS  -> The line below is present in float */

        // hTcxEnc->measuredBwRatio = 0x4000;

        /* Calculate target bits */

lib_enc/core_enc_updt_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ void core_encode_update_fx( Encoder_State *st ) 
    }

    /* Update previous mode */



    // move16();

    // st->last_core = st->core; /* _DIFF_FLOAT_FIX_ not in float -> remove? */





    test();

    test();

    test();

lib_enc/gs_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ void encod_audio_fx( 
     * Updates

     *--------------------------------------------------------------------------------------*/



    hLPDmem->mem_w0 = hGSCEnc->mem_w0_tmp_fx; /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */

    hLPDmem->mem_w0 = hGSCEnc->mem_w0_tmp_fx; 

    move16();

    Copy( exc_wo_nf, exc, st_fx->L_frame );
@@ -761,7 +761,7 @@ void encod_audio_ivas_fx( 
     * Updates

     *--------------------------------------------------------------------------------------*/

    Copy_Scale_sig( &hGSCEnc->mem_w0_tmp_fx, &hLPDmem->mem_w0, 1, sub( hLPDmem->q_mem_syn, sub( Q_new, 1 ) ) );

    /*_DIFF_FLOAT_FIX_  The way it is written in the original fix point is that at this point mem_w0 falls back to its original value (before enc_pit_exc, seems not the case in float */



    move16();

    Copy( exc_wo_nf, exc, st_fx->L_frame ); /* Q_new */