Commit 8b99d4d6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

apply some basop specific fixes

parent 393f94ff

lib_dec/ivas_init_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -456,8 +456,8 @@ ivas_error ivas_dec_setup( 
            st_ivas->nchan_ism = add( add( shl( st_ivas->bit_stream[res_dec - 1], 1 ), st_ivas->bit_stream[res_dec - 2] ), 1 );

            move16();



            test();

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

			test();

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

            {

#endif
@@ -479,7 +479,7 @@ ivas_error ivas_dec_setup( 
            /* read Ambisonic (SBA) order */

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            /* read the real Ambisonic order when the above bits are used to signal OSBA format */

            if ( ivas_total_brate < IVAS_24k4 )

            if ( LT_16( ivas_total_brate, IVAS_24k4 ) )

            {

                st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];

                st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];
@@ -529,7 +529,7 @@ ivas_error ivas_dec_setup( 
            }



#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( EQ_16( 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_dec/ivas_sba_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void ivas_sba_set_cna_cng_flag( 
        move16();

    }

#ifdef NONBE_FIX_ISM_XOVER_BR

    else if ( EQ_16( st_ivas->nchan_transport, 2 ) && NE_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

    ELSE IF ( EQ_16( st_ivas->nchan_transport, 2 ) && NE_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

#else

    ELSE IF( EQ_16( st_ivas->nchan_transport, 2 ) )

#endif
@@ -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 ( EQ_16( 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