Commit bd599b48 authored by vaclav's avatar vaclav
Browse files

address VE comment and rename 'is_masa_type_format' to 'is_masa_ivas_format'

parent 74be5e8e

lib_com/ivas_dirac_com.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ ivas_error ivas_dirac_sba_config( 
    ivas_error error;



    error = IVAS_ERR_OK;

    hQMetaData->is_masa_type_format = 0;

    hQMetaData->is_masa_ivas_format = 0;



    if ( sba_mode == SBA_MODE_SPAR )

    {

lib_com/ivas_stat_com.h

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ typedef struct ivas_masa_qmetadata_frame_struct 
    /* Status values on metadata quality */

    int16_t ec_flag;

    float dir_comp_ratio;

    uint8_t is_masa_type_format; // VE: use 'ivas_format' instead

    uint8_t is_masa_ivas_format;

} IVAS_QMETADATA, *IVAS_QMETADATA_HANDLE;

lib_dec/ivas_dirac_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ void ivas_dirac_dec_read_BS( 
        else

        {

            hQMetaData->sba_inactive_mode = 0;

            hQMetaData->is_masa_type_format = 0;

            hQMetaData->is_masa_ivas_format = 0;

            if ( hQMetaData->useLowerRes )

            {

                hQMetaData->q_direction[0].cfg.nblocks = 1;

lib_dec/ivas_masa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ ivas_error ivas_masa_decode( 
    ivas_format = st_ivas->ivas_format;



    hMasa->data.dir_decode_quality = 1.0f; /* Set to default of max quality */

    hQMetaData->is_masa_type_format = 1;

    hQMetaData->is_masa_ivas_format = 1;



    *nb_bits_read = 0;

    next_bit_pos_orig = st->next_bit_pos;

lib_dec/ivas_qmetadata_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ int16_t ivas_qmetadata_dec_decode( 
            int16_t dummy;

            ec_flag = 2;



            if ( hQMetaData->is_masa_type_format == 0 )

            if ( hQMetaData->is_masa_ivas_format == 0 )

            {

                reduce_bits = bits_dir_raw - ( total_bits_1dir - bits_diff - bits_coherence - signal_bits );

                ind_order[0] = -1;