Commit 9d71a9be authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '137-sid-5-2-kbps-todos-in-qmetadata' into 'main' 

Made correction in SID MD bits calculation

See merge request !742
parents b492f395 cdb17881

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ 
/* 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_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */

#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

lib_dec/ivas_dirac_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -1718,8 +1718,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 */

#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

+2 −0
Original line number Diff line number Diff line
@@ -481,9 +481,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_qmetadata_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -1202,8 +1202,13 @@ int16_t ivas_qmetadata_dec_sid_decode( 


    if ( ivas_format == SBA_FORMAT )

    {

#ifndef FIX_137_SID_MD_BITS

        /* TODO: still use old sid frame size to keep bitexactness */

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

#else

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



#endif

    }

    else

    {

lib_enc/ivas_qmetadata_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -979,8 +979,13 @@ void ivas_qmetadata_enc_sid_encode( 


    if ( ivas_format == SBA_FORMAT )

    {

#ifndef FIX_137_SID_MD_BITS

        /* TODO: still use old sid frame size to keep bitexactness */

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

#else

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



#endif

    }

    else

    {
@@ -1275,6 +1280,7 @@ void reset_metadata_spatial( 
#endif

                hMetaData->ind_list[0].value = 1;

                metadata_sid_bits = (int16_t) ( IVAS_SID_5k2 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS;



                while ( hMetaData->nb_bits_tot < metadata_sid_bits )

                {

                    push_next_indice( hMetaData, 0, 1 ); /*fill bit*/