Commit da8bf305 authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

Removed unused SPAR/Dirac flag

parent 5af216f0

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ 


#define BINAURAL_AUDIO_CMDLINE



#define SBA_MODE_CLEANUP_2                              /*Dlb : Clean up of Unused signaling bit in SBA SID*/



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_dirac_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1886,9 +1886,11 @@ 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 */

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

        ( *nb_bits )++;

#endif

        hQMetaData->sba_inactive_mode = 1;

        orig_dirac_bands = hQMetaData->q_direction[0].cfg.nbands;

lib_dec/ivas_init_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -482,9 +482,11 @@ 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;

lib_dec/ivas_spar_decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -372,7 +372,11 @@ ivas_error ivas_spar_dec( 
        int16_t zero_pad_bits;

        *nb_bits_read += SID_FORMAT_NBITS;

        zero_pad_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - *nb_bits_read;

#ifdef SBA_MODE_CLEANUP_2

        assert( zero_pad_bits <= 2 );

#else

        assert( zero_pad_bits <= 1 );

#endif

        *nb_bits_read += zero_pad_bits;

    }