Commit 4871c37f authored by multrus's avatar multrus
Browse files

align types for bits_frame_nominal and last_bits_frame_nominal to int_16t

parent 3882460b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1613_LAST_BITS_FRAME_NOMINAL          /* FhG: align types for bits_frame_nominal and last_bits_frame_nominal to int_16t */



/* #################### End BE switches ################################## */

lib_dec/stat_dec.h

+13 −9
Original line number Diff line number Diff line
@@ -915,7 +915,11 @@ typedef struct Decoder_State 
    int32_t last_total_brate;     /* last total bitrate in kbps of the codec */

    int32_t last_total_brate_ber; /* last total bitrate in kbps of the codec - used only when first frame is lost and BER is detected afterwards */

    int16_t bits_frame_nominal;   /* avg bits per frame on active frame */

#ifdef FIX_FLOAT_1613_LAST_BITS_FRAME_NOMINAL

    int16_t last_bits_frame_nominal; /* last avg bits per frame on active frame */

#else

    int32_t last_bits_frame_nominal; /* last avg bits per frame on active frame */

#endif

    int16_t flag_ACELP16k;            /* flag indicating use of ACELP core at 16kHz internal sampling rate */

    int16_t bits_frame_channel;       /* bits frame channel */

    int16_t side_bits_frame_channel;  /* bits frame channel */