Commit 23b648c4 authored by vaclav's avatar vaclav
Browse files

introduce 'null_metadata_flag' and rename 'lowrate_metadata_flag'; 1 bit is ... 

introduce 'null_metadata_flag' and rename 'lowrate_metadata_flag'; 1 bit is  added to ISM_NO_META mode
parent 3e4983b0

lib_com/ivas_cnst.h

+3 −1
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ typedef enum 
#define ISM_NB_BITS_METADATA_NOMINAL            ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */



#ifdef FIX_532_ISM_MD_INACTIVE

#define ISM_METADATA_MD_FLAG_BITS               1 /* flag to distinguish between NULL metadata and low-rate ISM_NO_META class */

#define ISM_METADATA_INACTIVE_FLAG_BITS         1 /* flag to signal whether MD are sent in low-rate inactive frame */

#else

#define ISM_METADATA_VAD_FLAG_BITS              1
@@ -405,7 +406,8 @@ enum 
    IND_ISM_EXTENDED_NDP_FLAG, 

    IND_ISM_METADATA_FLAG,

#ifdef FIX_532_ISM_MD_INACTIVE

    IND_ISM_MD_INACTIVE_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_MD_NULL_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_MD_INACTIVE_FLAG = IND_ISM_MD_NULL_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_MD_INACTIVE_FLAG + MAX_NUM_OBJECTS,

#else

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

lib_com/ivas_ism_com.c

+13 −2
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ ivas_error ivas_ism_config( 
    const int16_t nchan_ism,                  /* i  : number of objects              */

    ISM_METADATA_HANDLE hIsmMeta[],           /* i/o: ISM metadata handles           */

    const int16_t ism_extended_metadata_flag, /* i  : extended metadata flag         */

#ifndef FIX_532_ISM_MD_INACTIVE

#ifdef FIX_532_ISM_MD_INACTIVE

    const int16_t null_metadata_flag[MAX_NUM_OBJECTS], /* i  : NULL MD flag                   */

#else

    const int16_t localVAD[MAX_NUM_OBJECTS], /* i  : local VAD flag                 */

#endif

    const int16_t ism_imp[],   /* i  : ISM importance flags           */
@@ -166,9 +168,18 @@ ivas_error ivas_ism_config( 
        {

#ifdef FIX_532_ISM_MD_INACTIVE

            if ( ism_imp[ch] == ISM_NO_META )

            {

                nb_bits_metadata[0] += ISM_METADATA_MD_FLAG_BITS;



                if ( null_metadata_flag[ch] )

                {

                    nb_bits_metadata[0] += ISM_METADATA_FLAG_BITS;

                }

                else

                {

                    nb_bits_metadata[0] += ISM_METADATA_INACTIVE_FLAG_BITS;

                }

            }

#else

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

            {

lib_com/ivas_prot.h

+3 −1
Original line number Diff line number Diff line
@@ -873,7 +873,9 @@ ivas_error ivas_ism_config( 
    const int16_t nchan_ism,                                    /* i  : number of objects                           */

    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */

    const int16_t ism_extended_metadata_flag,                   /* i  : extended metadata flag                      */

#ifndef FIX_532_ISM_MD_INACTIVE

#ifdef FIX_532_ISM_MD_INACTIVE

    const int16_t null_metadata_flag[MAX_NUM_OBJECTS],          /* i  : NULL MD flag                                */

#else

    const int16_t localVAD[MAX_NUM_OBJECTS],                    /* i  : local VAD flag                              */

#endif

    const int16_t ism_imp[],                                    /* i  : ISM importance flags                        */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ 


#define EXTERNAL_ORIENTATIONS                           /* Nokia: Contribution 41: (external) orientation information handling */



#define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: impprove MD coding in ISM inactive frames */

#define FIX_532_ISM_MD_INACTIVE                         /* VA: issue 532: improve MD coding in ISM inactive frames */



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

/* clang-format on */

lib_dec/ivas_ism_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -77,11 +77,7 @@ static ivas_error ivas_ism_bitrate_switching( 
    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    st_ivas->ism_mode = ism_mode;



#ifdef FIX_532_ISM_MD_INACTIVE

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#else

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

#endif

    {

        return error;

    }