Commit e043491c authored by multrus's avatar multrus
Browse files

fix compilation issues

parent 4c253784

lib_dec/ivas_init_dec_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ ivas_error ivas_dec_setup( 


#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            test();

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            IF( LT_32( ivas_total_brate, IVAS_24k4 ) || GE_32( ivas_total_brate, IVAS_256k ) )

            {

#endif

lib_enc/ivas_mct_core_enc_fx.c

+1 −9
Original line number Diff line number Diff line
@@ -699,19 +699,11 @@ void ivas_mct_core_enc_fx( 
    {

        nAvailBits = sub( nAvailBits, IVAS_FORMAT_SIGNALING_NBITS_EXTENDED );

        nAvailBits = sub( nAvailBits, SBA_ORDER_BITS + SBA_PLANAR_BITS );

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

        /*MCT is used at bitrates > 80 kbps and additional 1 bit is present at these bitrates*/

        if ( EQ_16( ivas_format, SBA_ISM_FORMAT ) )

        {

            nAvailBits = sub( nAvailBits, IVAS_COMBINED_FORMAT_SIGNALLING_BITS );

        }

#else

        test();

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

        /*MCT is used at bitrates > 80 kbps and additional 1 bit is present at these bitrates*/

        if ( EQ_32( ivas_format, SBA_ISM_FORMAT ) )

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

            nAvailBits = sub( nAvailBits, IVAS_COMBINED_FORMAT_SIGNALLING_BITS );

        }

#else

        if ( EQ_32( ivas_format, SBA_ISM_FORMAT ) && GT_16( nChannels, 4 ) )