Commit 6fba2e7a authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-baseline

parents b9392a0a 11bd534b

lib_dec/ivas_ism_metadata_dec.c

+1 −3
Original line number Diff line number Diff line
@@ -618,8 +618,6 @@ ivas_error ivas_ism_metadata_dec( 
    set_s( md_diff_flag, 1, nchan_ism );





    



    for ( ch = 0; ch < *nchan_transport; ch++ )

    {

        hSCE[ch]->hCoreCoder[0]->cng_ism_flag = 0;

lib_dec/ivas_jbm_dec.c

+7 −5
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ ivas_error ivas_jbm_dec_tc( 
        {

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt

#ifdef OSBA_DISC_OBJ_MCT

    , st_ivas->hSCE[0]->hCoreCoder[0]

                                                  ,

                                                  st_ivas->hSCE[0]->hCoreCoder[0]

#endif

                                                  ) ) != IVAS_ERR_OK )

            {
@@ -167,7 +168,8 @@ ivas_error ivas_jbm_dec_tc( 
        {

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt

#ifdef OSBA_DISC_OBJ_MCT

    , st_ivas->hSCE[0]->hCoreCoder[0]

                                                  ,

                                                  st_ivas->hSCE[0]->hCoreCoder[0]

#endif

                                                  ) ) != IVAS_ERR_OK )

            {

lib_dec/ivas_spar_decoder.c

100755 → 100644
+2 −2

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_enc/ivas_ism_metadata_enc.c

+7 −3
Original line number Diff line number Diff line
@@ -240,7 +240,9 @@ ivas_error ivas_ism_metadata_enc( 


            if ( hIsmMeta[ch]->ism_metadata_flag == 1 )

            {

#ifdef OSBA_DISC_OBJ_MCT

                if ( ism_mode != ISM_SBA_MODE_DISC ) /*TODOfto this may cost a few bits but it is supposed to be for the higher bitrates anyway*/

#endif

                {

                    /* In case of low level noise for low bitrate inactive frames, do not sent metadata */

                    hIsmMeta[ch]->ism_metadata_flag = vad_flag[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10 || hSCE[ch]->hCoreCoder[0]->tcxonly;
@@ -362,11 +364,13 @@ ivas_error ivas_ism_metadata_enc( 
                push_indice( hBstr, IND_ISM_MD_INACTIVE_FLAG, lowrate_metadata_flag[ch], ISM_METADATA_INACTIVE_FLAG_BITS );

            }

        }

#ifdef OSBA_DISC_OBJ_MCT

        else /*ism_mode == ISM_SBA_MODE_DISC*/

        {

            /* all objects are considered active*/

            push_indice( hBstr, IND_ISM_METADATA_FLAG, 1, 1 );

        }

#endif

    }

lib_dec/ivas_osba_dec.c

+2 −2

File changed.

Contains only whitespace changes.

lib_enc/ivas_ism_enc.c

+6 −6

File changed.

Contains only whitespace changes.

lib_enc/ivas_mct_enc.c

+1 −1

File changed.

Contains only whitespace changes.

lib_dec/ivas_dec.c

+3 −3

File changed.

Contains only whitespace changes.