Commit 3374e955 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

replace fixed by variable x-over BR in format signaling

parent 1605011e

lib_dec/ivas_init_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -468,7 +468,11 @@ 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;



#ifdef NONBE_FIX_ISM_XOVER_BR

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

#else

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

lib_enc/ivas_mct_core_enc.c

+5 −1
Original line number Diff line number Diff line
@@ -497,7 +497,11 @@ void ivas_mct_core_enc( 
    {

        nAvailBits -= IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

        nAvailBits -= SBA_ORDER_BITS + SBA_PLANAR_BITS;

#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ivas_format == SBA_ISM_FORMAT || ivas_total_brate >= IVAS_OSBA_DISCRETE_ISM_MIN_BR )

#else

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

#endif

        {

            nAvailBits -= IVAS_COMBINED_FORMAT_SIGNALLING_BITS;

        }

lib_dec/ivas_sba_dec.c

+1 −1

File changed.

Contains only whitespace changes.