Commit ea9255c2 authored by multrus's avatar multrus
Browse files

smaller improvements

parent e6fe5489

lib_dec/fd_cng_dec_fx.c

+4 −14
Original line number Diff line number Diff line
@@ -4337,14 +4337,11 @@ void configureFdCngDec_ivas_fx( 
    ELSE IF( EQ_32( hsCom->CngBitrate, -1 ) )

    {

        /* set minimum active CBR bitrate IF CngBitrate is uninitialized */

        IF( element_mode > EVS_MONO )

        {

            hsCom->CngBitrate = IVAS_13k2;

        hsCom->CngBitrate = ACELP_7k20;

        move32();

        }

        ELSE

        if ( GT_16( element_mode, EVS_MONO ) )

        {

            hsCom->CngBitrate = ACELP_7k20;

            hsCom->CngBitrate = IVAS_13k2;

            move32();

        }

    }
@@ -4495,14 +4492,6 @@ void configureFdCngDec_ivas_fx( 
    hFdCngDec->nFFTpart_shaping = hFdCngDec->npart_shaping; /*Q0*/

    move16();



#ifdef HARMONIZE_2499_CONFIGUREFDCNGDEC

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );

        BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );

    }

#endif



    SWITCH( hsCom->fftlen )

    {

        case 512:
@@ -4537,6 +4526,7 @@ void configureFdCngDec_ivas_fx( 
            assert( !"Unsupported FFT length for FD-based CNG" );

            BREAK;

    }



    BASOP_getTables( &hsCom->olapWinAna, NULL, NULL, shr( hsCom->fftlen, 1 ) );

    BASOP_getTables( &hsCom->olapWinSyn, NULL, NULL, shr( hsCom->fftlen, 2 ) );

    hsCom->frameSize = shr( hsCom->fftlen, 1 );