Commit 80d0d11f authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '234-complexity-numbers-for-ivas-evs-mode-are-extremely-high-for-vbr-and-rate-switching-modes' into 'main'

Issue 234: fix extremely high complexity numbers for IVAS EVS mode; under FIX_VBR_COMPLEXITY

See merge request !319
parents feed021c a79e252a

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -175,9 +175,10 @@ 
#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */

#define FIX_ITD_CNG                                     /* Eri: Fix for CNG ITD */

#define FIX_VBR_COMPLEXITY                              /* Issue 234: fix extremely high complexity numbers for IVAS EVS mode */





#define FIX_ITD_CNG                                     /* Eri: Fix for CNG ITD */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_com/wi.c

+1647 −107

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/dec_gen_voic.c

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ ivas_error decod_gen_voic( 
                }

            }



            count_free( PREVP );

            count_free( CURRP );

            dynamic_free( PREVP );

            dynamic_free( CURRP );

        }

    }

lib_dec/ppp_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ ivas_error ppp_quarter_decoder( 
    tmp = (float) get_next_indice( st, 3 );

    DTFS_phaseShift( CURRCW_Q_DTFS, (float) ( PI2 * ( tmp - 3 ) / CURRCW_Q_DTFS->lag ) );



    count_free( PREVDTFS );

    dynamic_free( PREVDTFS );



    return error;

}

lib_dec/voiced_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -233,9 +233,9 @@ ivas_error ppp_voiced_decoder( 
    mvr2r( dtfs_temp->a, hSC_VBR->dtfs_dec_a, MAXLAG_WI );

    mvr2r( dtfs_temp->b, hSC_VBR->dtfs_dec_b, MAXLAG_WI );



    count_free( TMPDTFS );

    count_free( CURRP_Q_D );

    count_free( dtfs_temp );

    dynamic_free( TMPDTFS );

    dynamic_free( CURRP_Q_D );

    dynamic_free( dtfs_temp );



    return error;

}