Commit fe204e8a authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec... 

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-paseline_pc
parents c773201f b680f113

lib_dec/ivas_init_dec.c

+2 −9
Original line number Diff line number Diff line
@@ -419,16 +419,9 @@ ivas_error ivas_dec_setup( 
#endif

#ifdef SBA_AND_OBJECTS

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

            if ( ivas_total_brate >= IVAS_256k )

        {

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

            }

            else

            {

                st_ivas->nchan_ism = 0;

            }



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

            {