Commit 98b072ed authored by vaclav's avatar vaclav
Browse files

improve formatting

parent 06b55cbc

lib_com/ivas_dirac_com.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 5-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#if defined( NONBE_FIX_SBA_SIGNALING_BITS_B )

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

lib_dec/ivas_init_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -467,6 +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_B

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

            {
@@ -477,12 +478,12 @@ ivas_error ivas_dec_setup( 
#ifndef NONBE_FIX_SBA_SIGNALING_BITS_B

            }

#endif

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



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





#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 )

lib_enc/ivas_spar_encoder.c

+2 −1
Original line number Diff line number Diff line
@@ -354,9 +354,10 @@ 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