Commit 03271050 authored by multrus's avatar multrus
Browse files

[cleanup] accept SBA_MODE_CLEANUP_2

parent c0d646c2

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
/* only BE switches wrt operation points tested in selection */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/

#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define FIX_564                                         /* Nokia: Issue 564: Fix gains in JBM path for SBA with parametric binaural renderer */

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1172,11 +1172,7 @@ void ivas_dirac_dec_read_BS( 


        /* subtract mode signaling bits, since bitstream was moved after mode reading */

        st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS );

#ifndef SBA_MODE_CLEANUP_2

        /* 1 bit flag for SPAR/DirAC, already read in read format function */

#else

        /* 1 bit flag for signaling metadata to read */

#endif

        b = st->bit_stream[( st->next_bit_pos )--];

        ( *nb_bits )++;

        hQMetaData->sba_inactive_mode = 1;

lib_dec/ivas_init_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -825,11 +825,6 @@ static ivas_error ivas_read_format( 


        if ( st_ivas->ivas_format == SBA_FORMAT )

        {

#ifndef SBA_MODE_CLEANUP_2

            int16_t tc_mode_offset;

            tc_mode_offset = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 );

            idx = st_ivas->bit_stream[tc_mode_offset];

#endif

            if ( st_ivas->sba_analysis_order == 0 )

            {

                st_ivas->sba_analysis_order = SBA_FOA_ORDER;