Commit 57ef78cf authored by emerit's avatar emerit
Browse files

fix test error

parent 10b2b6f8

lib_com/ivas_ism_config.c

+7 −6
Original line number Diff line number Diff line
@@ -93,6 +93,9 @@ ivas_error ivas_ism_config( 
    ISM_METADATA_HANDLE hIsmMeta[],          /* i/o: ISM metadata handles        */

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

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

#ifdef ISM_NO_DIEGETIC_PAN

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

#endif

    int32_t element_brate[],   /* o  : element bitrate per object  */

    int32_t total_brate[],     /* o  : total bitrate per object    */

    int16_t nb_bits_metadata[] /* i/o: number of metadata bits     */
@@ -141,9 +144,7 @@ ivas_error ivas_ism_config( 


        for ( ch = 0; ch < n_ISms; ch++ )

        {

#ifndef ISM_NO_DIEGETIC_PAN

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

#endif

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

            {

                nb_bits_metadata[0] += ISM_METADATA_VAD_FLAG_BITS;

            }

lib_com/ivas_prot.h

+3 −0
Original line number Diff line number Diff line
@@ -750,6 +750,9 @@ ivas_error ivas_ism_config( 
    ISM_METADATA_HANDLE hIsmMeta[],                             /* i/o: ISM metadata handles                        */

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

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

#ifdef ISM_NO_DIEGETIC_PAN

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

#endif

    int32_t element_brate[],                                    /* o  : element bitrate per object                  */

    int32_t total_brate[],                                      /* o  : total bitrate per object                    */

    int16_t nb_bits_metadata[]                                  /* i/o: number of metadata bits                     */

lib_dec/ivas_ism_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -62,7 +62,11 @@ static ivas_error ivas_ism_bitrate_switching( 
    nCPE_old = st_ivas->nCPE;

    nSCE_old = st_ivas->nSCE;



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

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, num_obj, NULL, NULL, NULL,

#ifdef ISM_NO_DIEGETIC_PAN

                                    0,

#endif

                                    element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

    {

        return error;

    }

lib_dec/ivas_ism_metadata_dec.c

+135 −127
Original line number Diff line number Diff line
@@ -610,7 +610,11 @@ ivas_error ivas_ism_metadata_dec( 


    if ( !bfi )

    {

        if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, num_obj, hIsmMeta, localVAD, ism_imp,

#ifdef ISM_NO_DIEGETIC_PAN

                                        ism_extended_metadata_flag,

#endif

                                        element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -715,7 +719,11 @@ ivas_error ivas_ism_metadata_dec_create( 
        ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );

    }



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

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL,

#ifdef ISM_NO_DIEGETIC_PAN

                                    0,

#endif

                                    element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

    {

        return error;

    }

lib_enc/ivas_ism_enc.c

+5 −1
Original line number Diff line number Diff line
@@ -369,7 +369,11 @@ ivas_error ivas_ism_enc_config( 
        st_ivas->nSCE = st_ivas->nchan_transport;

        st_ivas->nCPE = 0;



        if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_ism_config( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->hEncoderConfig->nchan_inp, NULL, NULL, NULL,

#ifdef ISM_NO_DIEGETIC_PAN

                                        0,

#endif

                                        element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

        {

            return error;

        }