Commit bf029082 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

sba_code == SBA_MODE_SPAR clean up

parent 9b1614d9

lib_dec/ivas_qmetadata_dec.c

+1 −8
Original line number Diff line number Diff line
@@ -869,14 +869,7 @@ int16_t ivas_qmetadata_dec_sid_decode( 
    /* TODO: temporary hack to keep BE */

    if ( ivas_format == SBA_FORMAT )

    {

        if ( sba_mode == SBA_MODE_SPAR )

        {

#if 0

			/*This would break BE for SPAR modes, hence disabling it for now*/

            metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * 18 ) - 1 - SID_FORMAT_NBITS; /* -1 for inactive mode header bit*/

#endif

        }

        else

        if ( sba_mode != SBA_MODE_SPAR )

        {

            metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - 1; /* -1 for spar/dirac indicator*/

        }

lib_enc/ivas_qmetadata_enc.c

+4 −11
Original line number Diff line number Diff line
@@ -892,14 +892,7 @@ void ivas_qmetadata_enc_sid_encode( 
    /* TODO: temporary to keep BE */

    if ( ivas_format == SBA_FORMAT )

    {

        if ( sba_mode == SBA_MODE_SPAR )

        {

#if 0

			/*This would break BE for SPAR modes, hence disabling it for now*/

            metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND ) - 1 - SID_FORMAT_NBITS; /* -1 for inactive mode header bit*/

#endif

        }

        else

        if ( sba_mode != SBA_MODE_SPAR )

        {

            /* keep 13.2 and 16.4 SID bitrate as 4.4 kbps for now*/

            metadata_sid_bits = ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS - 1; /* -1 for spar/dirac indicator*/