Commit 21f6a20e authored by premathasara's avatar premathasara
Browse files

Sorry, I got very confused. Those "bad" merges were indeed fine and were new... 

Sorry, I got very confused. Those "bad" merges were indeed fine and were new to this branch. Added them back in.
parent 6f58a337

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -4006,7 +4006,8 @@ void ivas_spar_get_parameters( 
ivas_error ivas_spar_md_dec_init(

    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

    const int16_t num_channels                                  /* i  : number of internal channels             */

    const int16_t num_channels,                                 /* i  : number of internal channels             */

    const int16_t sba_order                                     /* i  : SBA order                */

);



void ivas_spar_md_dec_process(

lib_dec/ivas_spar_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static void ivas_spar_dec_MD( 
                hSpar->hMdDec->table_idx = table_idx;

                hSpar->hTdDecorr->ducking_flag = ivas_spar_br_table_consts[table_idx].td_ducking;



                ivas_spar_md_dec_init( hSpar->hMdDec, hDecoderConfig, num_channels );

                ivas_spar_md_dec_init( hSpar->hMdDec, hDecoderConfig, num_channels, sba_order );

            }

        }

lib_dec/ivas_spar_md_dec.c

+6 −5
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ static ivas_error ivas_spar_md_dec_matrix_open( 
ivas_error ivas_spar_md_dec_open(

    ivas_spar_md_dec_state_t **hMdDec_out,      /* i/o: SPAR MD decoder handle       */

    const DECODER_CONFIG_HANDLE hDecoderConfig, /* i  : configuration structure      */

    const int16_t num_channels                  /* i  : number of internal channels  */

    ,

    const int16_t num_channels,                 /* i  : number of internal channels  */

    const int16_t sba_order                     /* i  : SBA order                */

)

{
@@ -272,7 +271,7 @@ ivas_error ivas_spar_md_dec_open( 
    hMdDec->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hDecoderConfig->ivas_total_brate );

    hMdDec->table_idx = 0; /* just to initialize state variables*/



    if ( ( error = ivas_spar_md_dec_init( hMdDec, hDecoderConfig, num_channels ) ) != IVAS_ERR_OK )

    if ( ( error = ivas_spar_md_dec_init( hMdDec, hDecoderConfig, num_channels, sba_order ) ) != IVAS_ERR_OK )

    {

        return error;

    }
@@ -433,7 +432,8 @@ void ivas_spar_md_dec_close( 
ivas_error ivas_spar_md_dec_init(

    ivas_spar_md_dec_state_t *hMdDec,           /* i/o: SPAR MD decoder handle       */

    const DECODER_CONFIG_HANDLE hDecoderConfig, /* i  : configuration structure      */

    const int16_t num_channels                  /* i  : number of internal channels  */

    const int16_t num_channels,                 /* i  : number of internal channels  */

    const int16_t sba_order                     /* i  : SBA order                */

)

{

    int16_t i, j, k;
@@ -442,6 +442,7 @@ ivas_error ivas_spar_md_dec_init( 


    hMdDec->spar_md_cfg.gen_bs = 1; // VE2DB : always 1 - can it be removed?



    hMdDec->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hDecoderConfig->ivas_total_brate );

    hMdDec->spar_md.num_bands = ( hMdDec->spar_hoa_md_flag ) ? IVAS_MAX_NUM_BANDS : min( IVAS_MAX_NUM_BANDS, SPAR_DIRAC_SPLIT_START_BAND );



    ivas_spar_set_bitrate_config( &hMdDec->spar_md_cfg, hMdDec->table_idx,

lib_enc/ivas_spar_md_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ static ivas_error ivas_spar_md_enc_init( 
    float PR_minmax[2];

    int16_t num_channels, i, j, k;



    hMdEnc->spar_hoa_md_flag = ivas_sba_get_spar_hoa_md_flag( sba_order, hEncoderConfig->ivas_total_brate );

    num_channels = ivas_sba_get_nchan_metadata( sba_order );



    table_idx = ivas_get_spar_table_idx( hEncoderConfig->ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );