Commit 18fec032 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '543-mc-paramupmix-data-type-mismatch' into 'main' 

Resolve "MC ParamUpmix data type mismatch"

See merge request !736
parents c372c849 983ce563

lib_dec/ivas_stat_dec.h

+2 −1
Original line number Diff line number Diff line
@@ -800,10 +800,11 @@ typedef struct ivas_mc_paramupmix_dec_data_structure 
    float beta_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];

    int32_t alpha_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];

    int32_t beta_quant[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];

    bool first_frame;

    int16_t first_frame;

    float *pcm_delay[MC_PARAMUPMIX_MAX_TRANSPORT_CHANS];



} MC_PARAMUPMIX_DEC_DATA, *MC_PARAMUPMIX_DEC_HANDLE;



/*------------------------------------------------------------------------------------------*

 * SPAR decoder structures

 *------------------------------------------------------------------------------------------*/

lib_enc/ivas_stat_enc.h

+3 −1
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ typedef struct ivas_param_mc_enc_data_structure 
/*----------------------------------------------------------------------------------*

 * MC ParamUpmix Mode encoder structures

 *----------------------------------------------------------------------------------*/



typedef struct ivas_mc_paramupmix_enc_data_structure

{

    ivas_trans_det_state_t *hTranDet[MC_PARAMUPMIX_COMBINATIONS * MC_PARAMUPMIX_NCH];
@@ -746,7 +747,8 @@ typedef struct ivas_mc_paramupmix_enc_data_structure 
    float *midside[MC_PARAMUPMIX_COMBINATIONS][MC_PARAMUPMIX_NCH]; /* hold PCM of mid-side data */

    int32_t alpha_quant_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];

    int32_t beta_quant_prev[MC_PARAMUPMIX_COMBINATIONS][IVAS_MAX_NUM_BANDS];

    bool first_frame;

    int16_t first_frame;



} MC_PARAMUPMIX_ENC_DATA, *MC_PARAMUPMIX_ENC_HANDLE;



/*----------------------------------------------------------------------------------*