Commit 24f694d1 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '1637_ref_port-mr-1501-from-float' into 1640_ref_port-mr-1347-from-float

parents f86c7e04 d48c9763

lib_com/ivas_dirac_com.c

+4 −0
Original line number Diff line number Diff line
@@ -346,7 +346,11 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS            /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

#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 */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec.c

+15 −1
Original line number Diff line number Diff line
@@ -428,22 +428,36 @@ 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 )

            {

                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;

            }

#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

+12 −0
Original line number Diff line number Diff line
@@ -497,10 +497,18 @@ 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++ )
@@ -574,7 +582,11 @@ 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

lib_enc/ivas_spar_encoder.c

+11 −1
Original line number Diff line number Diff line
@@ -354,11 +354,21 @@ ivas_error ivas_spar_enc( 
            /* Write SBA planar flag */

            push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_planar, SBA_PLANAR_BITS );



            /* hack to indicate OSBA bitstream at VLBR */

            /* hack to indicate OSBA format (SBA order = 0) at low bitrates */

            push_indice( st0->hBstr, IND_SMODE, 0, SBA_ORDER_BITS );

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B



            /* additionally code the real SBA order */

            push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_order, SBA_ORDER_BITS );

#endif

        }

        else

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            /* Write SBA planar flag */

            push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_planar, SBA_PLANAR_BITS );

#endif



            /* Write SBA order */

            push_indice( st0->hBstr, IND_SMODE, hEncoderConfig->sba_order, SBA_ORDER_BITS );

        }