Commit 71cfe1a6 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into 112-add-self_test_evs-prm-to-mr-pipeline-not-allowed-to-fail 

Merge with main
parents 2c440902 c9c31ba6

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ enum 
#define MASA_STEREO_MIN_BITRATE                 IVAS_24k4



#define MASA_BIT_REDUCT_PARAM                   10



#define MASA_MAXIMUM_TWO_DIR_BANDS             18

typedef enum

{

    MASA_STEREO_NOT_DEFINED,

lib_com/ivas_rom_com.c

+1 −1
Original line number Diff line number Diff line
@@ -2731,7 +2731,7 @@ const uint8_t masa_twodir_bands[IVAS_NUM_ACTIVE_BRATES] = 


const uint8_t masa_twodir_bands_joined[IVAS_NUM_ACTIVE_BRATES] =

{

    0,           0,           0,           0,          0,          2,          2,          3,          4,           6,           8,           9,           12,           18

    0,           0,           0,           0,          0,          2,          2,          3,          4,           6,           8,           9,           12,          MASA_MAXIMUM_TWO_DIR_BANDS

};

lib_enc/ivas_qmetadata_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ ivas_error ivas_qmetadata_enc_encode( 
    int16_t diff_bits, bits_ec, next_ind_raw_flag;

    int16_t dfRatio_bits[MASA_MAXIMUM_CODING_SUBBANDS];

    int16_t bits_surround_coh, no_TF;

    int16_t dir2_bands[MASA_MAXIMUM_CODING_SUBBANDS / 2];

    int16_t dir2_bands[MASA_MAXIMUM_TWO_DIR_BANDS];

    int16_t ind_order[MASA_MAXIMUM_CODING_SUBBANDS];

    int16_t reduce_bits;

    ivas_error error;