Commit 0c934c43 authored by vaclav's avatar vaclav
Browse files

update NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ - take into account also 'icbwe_brate'

parent a119195e

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ LDLIBS += -lm 
CCCLANG = clang

ifeq "$(CLANG)" "1"

CC       = $(CCCLANG)

CFLAGS  += -fsanitize=memory

CFLAGS  += -fsanitize=memory -fsanitize-memory-track-origins

LDFLAGS += -fsanitize=memory

endif

ifeq "$(CLANG)" "2"

lib_dec/acelp_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ ivas_error acelp_core_dec( 
                decod_tran( st, st->L_frame, tc_subfr, Aq, Es_pred, pitch_buf, voice_factors, exc, exc2, bwe_exc, unbits, sharpFlag, gain_buf );

            }

#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ

            else if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && ( st->core_brate + st->extl_brate <= MAX_GSC_INACTIVE_BRATE ) ) )

            else if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && ( st->core_brate + st->extl_brate + st->icbwe_brate <= MAX_GSC_INACTIVE_BRATE ) ) )

#else

            else if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )

#endif

lib_dec/decision_matrix_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -405,7 +405,9 @@ void decision_matrix_dec( 


    /* set core bitrate */

    st->core_brate = st->total_brate - st->extl_brate;



#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ

    st->icbwe_brate = 0;

#endif



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

     * Read HQ signaling bits from the bitstream

lib_dec/init_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ ivas_error init_decoder( 
    st->bwidth = NB;

    st->last_bwidth = NB;

    st->extl_brate = 0;

#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ

    st->icbwe_brate = 0;

#endif



    st->coder_type = GENERIC;

    st->last_coder_type = GENERIC;

lib_dec/ivas_decision_matrix_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ void ivas_decision_matrix_dec( 


    /* set core bitrate */

    st->core_brate = st->total_brate - st->extl_brate - icbwe_brate;

#ifdef NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ

    st->icbwe_brate = icbwe_brate;

#endif



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

     * Read transform core (TCX vs. HQ) signaling bit from the bitstream