Commit 5e85b294 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

rename NONBE_FIX_SBA_SIGNALING_BITS to NONBE_FIX_SBA_SIGNALING_BITS_A

parent 1ba56e6a

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
#define NONBE_FIX_1054_NEGATIVE_LVQ_INDEX               /* Nokia: issue 1054: Input to decode_comb in deindex_lvq_SHB should be positive */

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */



#define NONBE_FIX_SBA_SIGNALING_BITS

#define NONBE_FIX_SBA_SIGNALING_BITS_A                  /* FhG: issue 1061: option A: clan up OSBA and ISM signaling using 4 bits all the time */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 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

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

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

#endif

            {
@@ -481,7 +481,7 @@ ivas_error ivas_dec_setup( 
            num_bits_read += SBA_ORDER_BITS;



            /* read Ambisonic (SBA) order */

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

            if ( ivas_total_brate < IVAS_256k )

            {

                st_ivas->sba_order = 3;
@@ -789,7 +789,7 @@ static ivas_error ivas_read_format( 
                break;

            case 2:

                st_ivas->ivas_format = ISM_FORMAT;

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

                if ( ivas_total_brate >= IVAS_24k4 )

#endif

                {
@@ -805,7 +805,7 @@ static ivas_error ivas_read_format( 
                            st_ivas->ivas_format = MASA_ISM_FORMAT;

                        }

                    }

#ifdef NONBE_FIX_SBA_SIGNALING_BITS

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_A

                    else

                    {

                        ( *num_bits_read )++;
@@ -828,7 +828,7 @@ static ivas_error ivas_read_format( 
                    /* read Ambisonic (SBA) order */

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

                    st_ivas->sba_order += 2 * st_ivas->bit_stream[( *num_bits_read ) + 1 + SBA_PLANAR_BITS];

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

                    if ( st_ivas->sba_order == 0 )

                    {

                        st_ivas->ivas_format = SBA_ISM_FORMAT;

lib_enc/ivas_init_enc.c

+3 −3
Original line number Diff line number Diff line
@@ -67,11 +67,11 @@ void ivas_write_format( 
            break;

        case ISM_FORMAT:

            ind = 2;

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

            if ( st_ivas->hEncoderConfig->ivas_total_brate >= IVAS_24k4 )

#endif

            {

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

                ind = 4;

                nBits += extra_bits;

#else
@@ -111,7 +111,7 @@ void ivas_write_format( 
            }

            break;

        case SBA_ISM_FORMAT:

#ifndef NONBE_FIX_SBA_SIGNALING_BITS

#ifndef NONBE_FIX_SBA_SIGNALING_BITS_A

            if ( st_ivas->hEncoderConfig->ivas_total_brate < IVAS_24k4 )

            {

                ind = 6; /* send SBA format */

lib_enc/ivas_ism_dtx_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ int16_t ivas_ism_dtx_enc( 
            /* replicate ivas_write_format() */

            int16_t ind = 2;

            nBits = IVAS_FORMAT_SIGNALING_NBITS;

#ifdef NONBE_FIX_SBA_SIGNALING_BITS

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_A

            ind = 8;

            nBits = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

#else

lib_enc/ivas_mct_core_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ void ivas_mct_core_enc( 
    {

        nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

        nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS;

#ifdef NONBE_FIX_SBA_SIGNALING_BITS

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_A

        if ( ivas_format == SBA_ISM_FORMAT )

#else

        if ( ivas_format == SBA_ISM_FORMAT && nChannels > 4 )
@@ -579,7 +579,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

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_A

    format_bits += ( ivas_format == SBA_ISM_FORMAT );

#else

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