Commit 71601a8c authored by multrus's avatar multrus
Browse files

Merge branch '1642_basop_cleanup' into 'main' 

Port MR 1560 from float to main

Closes #1642

See merge request !2024
parents be824e84 0fe29756

lib_com/ivas_dirac_com_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -397,13 +397,8 @@ void ivas_get_dirac_sba_max_md_bits_fx( 
        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) = sub( ( *metadata_max_bits ), 7 );

            move16();

#else

            ( *metadata_max_bits ) = sub( ( *metadata_max_bits ), 3 );

            move16();

#endif

        }

    }

    ELSE IF( LE_32( sba_total_brate, IVAS_32k ) )

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -113,9 +113,7 @@ 
#define FIX_1831_REVERB_REGRESSION                      /* Philips: fixes reverb regression issues  */

#define FIX_1835_REVERB_ACTIVATION                      /* FhG: Modified reverberation activation logic and corrected factEQ calculation */

#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

lib_dec/core_dec_init_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1287,11 +1287,7 @@ void open_decoder_LPD_ivas_fx( 
        st->inv_gamma = GAMMA16k_INV;

        move16();

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    ELSE IF( GT_16( st->element_mode, EVS_MONO ) && GT_32( st->sr_core, INT_FS_16k ) )

#else

    ELSE IF( GT_32( st->sr_core, INT_FS_16k ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

#endif

    {

        st->gamma = GAMMA16k;

        move16();

lib_dec/ivas_init_dec_fx.c

+4 −20
Original line number Diff line number Diff line
@@ -531,18 +531,10 @@ 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();



#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            test();

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

            {

#endif

            /* read Ambisonic (SBA) planar flag */

            st_ivas->sba_planar = st_ivas->bit_stream[num_bits_read];

            move16();

            num_bits_read = add( num_bits_read, SBA_PLANAR_BITS );

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            }

#endif



            /* read Ambisonic (SBA) order (0 for signaling OSBA format at low bitrates)*/

            st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];
@@ -552,7 +544,6 @@ ivas_error ivas_dec_setup( 
            num_bits_read = add( num_bits_read, SBA_ORDER_BITS );



            /* 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 ( LT_32( ivas_total_brate, IVAS_24k4 ) )

            {
@@ -560,13 +551,6 @@ ivas_error ivas_dec_setup( 
                st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];

                num_bits_read += SBA_ORDER_BITS;

            }

#else

            if ( LT_32( ivas_total_brate, IVAS_256k ) )

            {

                st_ivas->sba_order = 3;

                move16();

            }

#endif



            test();

            IF( st_ivas->ini_frame > 0 && NE_32( ivas_total_brate, st_ivas->last_active_ivas_total_brate ) )

lib_enc/ivas_mct_core_enc_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -699,18 +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_32( ivas_format, SBA_ISM_FORMAT ) )

        {

            nAvailBits = sub( nAvailBits, IVAS_COMBINED_FORMAT_SIGNALLING_BITS );

        }

#else

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

        {

            nAvailBits = sub( nAvailBits, IVAS_COMBINED_FORMAT_SIGNALLING_BITS );

        }

#endif

    }



    FOR( ( cpe_id = 0, i = 0 ); cpe_id < nCPE; cpe_id++ )