Commit 4e4bb936 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix data types and comparisons

parent e4aec20b

lib_dec/ivas_sba_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
    ISM_MODE ism_mode_old;

    Word16 granularity_new;

#ifdef NONBE_FIX_ISM_XOVER_BR

    int16_t nchan_transport;

    Word16 nchan_transport;

#endif



    ism_mode_old = st_ivas->ism_mode;
@@ -157,7 +157,7 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
    IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

    {

#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC )

        if ( EQ_16( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ), ISM_SBA_MODE_DISC ) )

#else

        IF( GE_32( ivas_total_brate, IVAS_256k ) )

#endif

lib_enc/ivas_init_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1441,11 +1441,15 @@ ivas_error ivas_init_encoder_fx( 
        st_ivas->ism_mode = ISM_MODE_NONE;

        move16();



#ifdef NONBE_FIX_ISM_XOVER_BR

		st_ivas->ism_mode = ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism);

#else

        IF( GE_32( ivas_total_brate, IVAS_256k ) )

        {

            st_ivas->ism_mode = ISM_SBA_MODE_DISC;

            move16();

        }

#endif



        IF( ( error = ivas_ism_metadata_enc_create_fx( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )

        {

lib_enc/ivas_osba_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ ivas_error ivas_osba_enc_reconfig( 
    ivas_total_brate = hEncoderConfig->ivas_total_brate;

    move32();

#ifdef NONBE_FIX_ISM_XOVER_BR

    int16_t nchan_transport;

    Word16 nchan_transport;

#endif



    IF( NE_32( ivas_total_brate, hEncoderConfig->last_ivas_total_brate ) )