Commit 2e87ebab authored by multrus's avatar multrus
Browse files

converst last_bits_frame_nominal from Word32 to Word16, to align with... 

converst last_bits_frame_nominal from Word32 to Word16, to align with bits_frame_nominal and avoid compiler warnings
parent d1cb41b0

lib_dec/ivas_tcx_core_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -162,10 +162,17 @@ void stereo_tcx_init_dec_fx( 
    test();

    test();

    test();

#ifdef HARMONIZE_2583_open_decoder_LPD

    IF( ( NE_16( st->bits_frame_nominal, st->last_bits_frame_nominal ) ) ||

        ( NE_16( st->bwidth, st->last_bwidth ) ) ||

        ( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) && !( EQ_16( st->prev_bfi, 1 ) && st->last_core == ACELP_CORE && EQ_16( st->last_con_tcx, 1 ) ) ) ||

        ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( last_element_mode, IVAS_CPE_MDCT ) ) )

#else

    IF( ( NE_32( st->bits_frame_nominal, st->last_bits_frame_nominal ) ) ||

        ( NE_16( st->bwidth, st->last_bwidth ) ) ||

        ( NE_16( st->last_core, TCX_20_CORE ) && NE_16( st->last_core, TCX_10_CORE ) && !( EQ_16( st->prev_bfi, 1 ) && st->last_core == ACELP_CORE && EQ_16( st->last_con_tcx, 1 ) ) ) ||

        ( EQ_16( st->idchan, 1 ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) && NE_16( last_element_mode, IVAS_CPE_MDCT ) ) )

#endif

    {

        /*re-initialization*/

lib_dec/stat_dec.h

+16 −12
Original line number Diff line number Diff line
@@ -1036,7 +1036,11 @@ typedef struct Decoder_State 
    Word32 last_total_brate;     /* last total bitrate in kbps of the codec */

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

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

#ifdef HARMONIZE_2583_open_decoder_LPD

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

#else

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

#endif

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

    Word16 bits_frame_channel;       /* bits frame channel */

    Word16 side_bits_frame_channel;  /* bits frame channel */

lib_dec/updt_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -829,7 +829,11 @@ void updt_dec_common_fx( 
        st_fx->last_total_brate = st_fx->total_brate;

        st_fx->last_bits_frame_nominal = st_fx->bits_frame_nominal;

        move32();

#ifdef HARMONIZE_2583_open_decoder_LPD

        move16();

#else

        move32();

#endif

    }



    st_fx->last_low_rate_mode = st_fx->low_rate_mode;