Commit b165ae4d authored by multrus's avatar multrus
Browse files

Merge branch '1642_ref_cleanup' into 'ivas-float-update' 

Port MR 1560 from float to ivas-float-update

See merge request !2023
parents 2a4952bf 4f7940bc

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -346,11 +346,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -183,10 +183,8 @@ 
#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_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals  */

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

#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_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

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

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

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

lib_dec/core_dec_init.c

+0 −4
Original line number Diff line number Diff line
@@ -150,11 +150,7 @@ void open_decoder_LPD( 
    {

        st->gamma = GAMMA16k;

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )

#else

    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )

#endif

    {

        st->gamma = GAMMA16k;

    }

lib_dec/ivas_init_dec.c

+3 −17
Original line number Diff line number Diff line
@@ -469,23 +469,15 @@ ivas_error ivas_dec_setup( 
            /* the number of objects is written at the end of the bitstream, in the SBA metadata */

            st_ivas->nchan_ism = 2 * st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 1] + st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 2] + 1;



#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            if ( ivas_total_brate < IVAS_24k4 || ivas_total_brate >= IVAS_256k )

            {

#endif

            /* read Ambisonic (SBA) planar flag */

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

            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];

            st_ivas->sba_order += 2 * st_ivas->bit_stream[num_bits_read];

            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 ( ivas_total_brate < IVAS_24k4 )

            {
@@ -493,12 +485,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 ( ivas_total_brate < IVAS_256k )

            {

                st_ivas->sba_order = 3;

            }

#endif



            if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->last_active_ivas_total_brate )

            {

lib_enc/ivas_mct_core_enc.c

+0 −11
Original line number Diff line number Diff line
@@ -497,18 +497,11 @@ void ivas_mct_core_enc( 
    {

        nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

        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 ( ivas_format == SBA_ISM_FORMAT )

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }

#else

        if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 )

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }

#endif

    }



    for ( cpe_id = 0, i = 0; cpe_id < nCPE; cpe_id++ )
@@ -582,11 +575,7 @@ void ivas_mct_core_enc( 


#ifdef DEBUGGING

    format_bits = ( ivas_format == MC_FORMAT ? IVAS_FORMAT_SIGNALING_NBITS + MC_LS_SETUP_BITS : IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + SBA_ORDER_BITS + SBA_PLANAR_BITS );

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

    format_bits += ( ivas_format == SBA_ISM_FORMAT );

#else

    format_bits += ( ivas_format == SBA_ISM_FORMAT && nChannels > FOA_CHANNELS );

#endif

    mct_bits += hMCT->nBitsMCT + hMCT->nchan_out_woLFE;

    assert( ( total_brate + ( NBITS_BWIDTH + format_bits + mct_bits + sba_meta + lfe_bits ) * FRAMES_PER_SEC ) == ivas_total_brate );

#endif