Commit add4f598 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'update-main-pc-with-main' into 'main-pc' 

[skip-name-check][non-BE][renderer-non-BE][allow-regression][split-non-BE]Update main-pc with main - Part 3

See merge request !1670
parents 6ce7781e 1d197314

apps/encoder.c

+6 −1
Original line number Diff line number Diff line
@@ -762,7 +762,12 @@ int main( 
        }



        /* *** Encode one frame *** */

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

            goto cleanup;

lib_com/bitstream.c

+2016 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ enum 
    IND_SHB_RES_GS2,

    IND_SHB_RES_GS3,

    IND_SHB_RES_GS4,

    IND_SHB_RES_GS5,

    IND_SHB_VF,

#else

    IND_SHB_VF = IND_SHB_RES_GS + 5,

lib_com/fd_cng_com_fx.c

+43 −25
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ void ivas_initFdCngCom_fx( HANDLE_FD_CNG_COM hFdCngCom, Word16 scale ) 
    move16();

    hFdCngCom->CngBitrate = -1;

    move16();

    hFdCngCom->olapBufferSynth_exp = 0;

    move16();



    /* Initialize noise estimation algorithm */

    set32_fx( hFdCngCom->periodog, 0, PERIODOGLEN );
@@ -2653,9 +2655,10 @@ void SynthesisSTFT_ivas_fx( 
    const Word16 nchan_out     /* i  : number of output channels */

)

{

    Word16 i, len, scale, tmp;

    Word16 i, len, scale, tmp, sft, exp, tmp1;

    Word16 len2, len3, len4;

    Word16 buf[M + 1 + L_FRAME16k];

    Word32 L_olapBuffer[FFTLEN];





    /* Perform IFFT */
@@ -2666,6 +2669,12 @@ void SynthesisSTFT_ivas_fx( 
    hFdCngCom->fftBuffer_exp = fftBufferExp;

    move16();



    sft = getScaleFactor32( fftBuffer, hFdCngCom->fftlen );

    scale_sig32( fftBuffer, hFdCngCom->fftlen, sft );

    fftBufferExp = sub( fftBufferExp, sft );

    hFdCngCom->fftBuffer_exp = fftBufferExp;

    move16();



    fftBufferExp = add( fftBufferExp, hFdCngCom->fftlenShift );



    /* Perform overlap-add */
@@ -2679,48 +2688,58 @@ void SynthesisSTFT_ivas_fx( 
    }

    ELSE

    {

        Copy( olapBuffer + hFdCngCom->frameSize, olapBuffer, hFdCngCom->frameSize );

        Copy_Scale_sig_16_32_no_sat( olapBuffer + hFdCngCom->frameSize, L_olapBuffer, hFdCngCom->frameSize, add( sub( hFdCngCom->olapBufferSynth_exp, sub( 15, hFdCngCom->fftlenShift ) ), 16 ) ); /* exp: hFdCngCom->olapBufferSynth_exp -> (15 - fftlenShift) */

        set16_fx( olapBuffer + hFdCngCom->frameSize, 0, hFdCngCom->frameSize );

    }

    len2 = shr( hFdCngCom->fftlen, 2 );

    len4 = shr( hFdCngCom->fftlen, 3 );

    len3 = add( len2, len4 );

    len = add( hFdCngCom->frameSize, len4 );

    tmp1 = sub( fftBufferExp, 15 );

    IF( tcx_transition )

    {

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

        {

            olapBuffer[i] = round_fx_sat( L_shl_sat( fftBuffer[i], fftBufferExp - 15 ) ); // Q(15 - fftBufferExp)

            move16();

            L_olapBuffer[i] = L_shl_sat( fftBuffer[i], tmp1 ); /* Q(31 - (15 - fftlenShift) ) */

            move32();

        }

    }

    ELSE

    {

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

        {

            olapBuffer[i + 1 * len4] = add_sat( olapBuffer[i + 1 * len4], mult_r( round_fx_sat( L_shl_sat( fftBuffer[i + 1 * len4], fftBufferExp - 15 ) ), olapWin[i].v.im ) );

            move16();

            olapBuffer[i + 2 * len4] = add_sat( olapBuffer[i + 2 * len4], mult_r( round_fx_sat( L_shl_sat( fftBuffer[i + 2 * len4], fftBufferExp - 15 ) ), olapWin[len4 - 1 - i].v.re ) );

            move16();

            L_olapBuffer[i + 1 * len4] = Madd_32_16( L_olapBuffer[i + 1 * len4], L_shl_sat( fftBuffer[i + 1 * len4], tmp1 ), olapWin[i].v.im ); /* Q(31 - (15 - fftlenShift) ) */

            move32();

            L_olapBuffer[i + 2 * len4] = Madd_32_16( L_olapBuffer[i + 2 * len4], L_shl_sat( fftBuffer[i + 2 * len4], tmp1 ), olapWin[len4 - 1 - i].v.re ); /* Q(31 - (15 - fftlenShift) ) */

            move32();

        }

        FOR( i = len3; i < len; i++ )

        {

            olapBuffer[i] = round_fx_sat( L_shl_sat( fftBuffer[i], fftBufferExp - 15 ) );

            L_olapBuffer[i] = L_shl_sat( fftBuffer[i], tmp1 ); /* Q(31 - (15 - fftlenShift) ) */

            move32();

        }

    }



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

    {

        olapBuffer[i + 5 * len4] = mult_r( round_fx_sat( L_shl_sat( fftBuffer[i + 5 * len4], fftBufferExp - 15 ) ), olapWin[i].v.re );

        move16();

        olapBuffer[i + 6 * len4] = mult_r( round_fx_sat( L_shl_sat( fftBuffer[i + 6 * len4], fftBufferExp - 15 ) ), olapWin[len4 - 1 - i].v.im );

        move16();

        L_olapBuffer[i + 5 * len4] = Mpy_32_16_1( L_shl_sat( fftBuffer[i + 5 * len4], tmp1 ), olapWin[i].v.re ); /* Q(31 - (15 - fftlenShift) ) */

        move32();

        L_olapBuffer[i + 6 * len4] = Mpy_32_16_1( L_shl_sat( fftBuffer[i + 6 * len4], tmp1 ), olapWin[len4 - 1 - i].v.im ); /* Q(31 - (15 - fftlenShift) ) */

        move32();

    }



    len = add( len, len2 );

    FOR( i = len; i < hFdCngCom->fftlen; i++ )

    {

        olapBuffer[i] = 0;

        L_olapBuffer[i] = 0;

        move32();

    }



    sft = L_norm_arr( L_olapBuffer, hFdCngCom->fftlen );

    IF( NE_16( sft, 31 ) )

    {

        Copy_Scale_sig32_16( L_olapBuffer, olapBuffer, hFdCngCom->fftlen, sft );

        hFdCngCom->olapBufferSynth_exp = sub( sub( 15, hFdCngCom->fftlenShift ), sft );

        move16();

    }
@@ -2737,24 +2756,23 @@ void SynthesisSTFT_ivas_fx( 
            buf[i] = mult_r( olapBuffer[i + len4 - M - 1], hFdCngCom->fftlenFac );

            move16();

        }

        exp = add( hFdCngCom->olapBufferSynth_exp, hFdCngCom->fftlenShift );

        tmp = buf[0];

    }

    IF( EQ_16( gen_exc, 1 ) )

    {

        Word16 s = getScaleFactor16( buf + 1, M + hFdCngCom->frameSize );

        if ( GT_16( *Q_new, s ) )

        {

            *Q_new = s;

        E_UTIL_f_preemph2( 0, buf + 1, PREEMPH_FAC, add( M, hFdCngCom->frameSize ), &tmp );

        Residu3_fx( hFdCngCom->A_cng, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize, 0 );

        *Q_new = sub( 15, exp );

        move16();

    }



        E_UTIL_f_preemph2( *Q_new - 1, buf + 1, PREEMPH_FAC, M + hFdCngCom->frameSize, &tmp );

        Residu3_fx( hFdCngCom->A_cng, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize, 1 );

    }

    IF( EQ_16( gen_exc, 2 ) )

    {

        *Q_new = E_UTIL_f_preemph3( buf + 1, PREEMPH_FAC, M + hFdCngCom->frameSize, &tmp, 1 );

        Residu3_fx( hFdCngCom->A_cng, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize, 1 );

        *Q_new = E_UTIL_f_preemph3( buf + 1, PREEMPH_FAC, add( M, hFdCngCom->frameSize ), &tmp, 0 );

        move16();

        Residu3_fx( hFdCngCom->A_cng, buf + 1 + M, hFdCngCom->exc_cng, hFdCngCom->frameSize, negate( *Q_new ) );

        *Q_new = sub( 15, exp );

        move16();

    }

}

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


/*#define DEBUGGING*/                             /* Allows debugging message to be printed out during runtime */

#ifdef DEBUGGING

/*#define DBG_BITSTREAM_ANALYSIS*/            /* Write bitstream with annotations to a text file */

#define DEBUG_MODE_INFO                       /* Define to output most important parameters to the subdirectory "res/" */

#define DEBUG_MODE_INFO_TWEAK                 /* Enable command line switch to specify subdirectory for debug info output inside "./res/" */

#define DEBUG_FORCE_MDCT_STEREO_MODE          /* Force stereo mode decision for MDCT stereo: -stereo 3 1 forces L/R coding and -stereo 3 2 forces full M/S coding */
@@ -98,6 +99,7 @@ 
#define FIX_1486_IND_SHB_RES                   /* VA: Fix for issue 1486: align the usage of IND_SHB_RES_GS indices with float code */



#define TEST_HR

#define REMOVE_EVS_DUPLICATES                   /* remove core-coder duplicated functions, ACELP low-band decoder */



/* #################### Start BASOP porting switches ############################ */