Commit 65f62486 authored by Shikha Shetgeri's avatar Shikha Shetgeri
Browse files

addressed review comments

parent da8bf305

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -3194,6 +3194,10 @@ int16_t ivas_qmetadata_dec_sid_decode( 
    ,

    const SBA_MODE sba_mode                                     /* i  : SBA mode                                */

#endif

#ifdef SBA_MODE_CLEANUP_2

  ,

  const int32_t ivas_total_brate                                /* i  : IVAS total bitrate                      */

#endif

);



void ivas_qmetadata_to_dirac(

lib_dec/ivas_dirac_dec.c

+9 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,11 @@ void ivas_dirac_dec_read_BS( 
#ifndef SBA_MODE_CLEAN_UP

                *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT, sba_mode );

#else

            *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );

#ifdef SBA_MODE_CLEANUP_2

            *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT, ivas_total_brate );

#else

            *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT, ivas_total_brate );

#endif

#endif

                for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

                {
@@ -1909,9 +1913,13 @@ void ivas_dirac_dec_read_BS( 


#ifndef SBA_MODE_CLEAN_UP

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT, sba_mode );

#else

#ifdef SBA_MODE_CLEANUP_2

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT, ivas_total_brate );

#else

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );

#endif

#endif

#ifndef SBA_MODE_CLEAN_UP

        if ( sba_mode == SBA_MODE_SPAR )

        {

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -289,8 +289,12 @@ ivas_error ivas_masa_decode( 
        tmp_elem_mode = -1;

#ifndef SBA_MODE_CLEAN_UP

        *nb_bits_read += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), st_ivas->nchan_transport, &tmp_elem_mode, ivas_format, SBA_MODE_NONE );

#else

#ifdef SBA_MODE_CLEANUP_2

        *nb_bits_read += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), st_ivas->nchan_transport, &tmp_elem_mode, ivas_format, ivas_total_brate );

#else

        *nb_bits_read += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), st_ivas->nchan_transport, &tmp_elem_mode, ivas_format );

#endif

#endif

        if ( st_ivas->nchan_transport == 2 )

        {

lib_dec/ivas_qmetadata_dec.c

+16 −1
Original line number Diff line number Diff line
@@ -1269,6 +1269,10 @@ int16_t ivas_qmetadata_dec_sid_decode( 
    ,

    const SBA_MODE sba_mode /* i  : SBA mode                             */

#endif

#ifdef SBA_MODE_CLEANUP_2

    ,

    const int32_t ivas_total_brate   /* i  : IVAS total bitrate                    */

#endif

)

{

    int16_t b, m, i;
@@ -1304,7 +1308,18 @@ int16_t ivas_qmetadata_dec_sid_decode( 
        {

#endif

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

#ifdef SBA_MODE_CLEANUP_2

            if ( ivas_total_brate == IVAS_SID_5k2 )

            {

                metadata_sid_bits = (int16_t) ( 5000 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * 18 );

            }

            else

            {

                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) ( 5000 /*IVAS_SID_5k2*/ - SID_2k40 ) / FRAMES_PER_SEC - ( SPAR_DTX_BANDS * 18 ) - 1; /* -1 for inactive mode header bit*/

#endif

#ifndef SBA_MODE_CLEAN_UP

        }

        else

lib_dec/ivas_spar_decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -372,11 +372,7 @@ 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;

    }