Commit 49e2596d authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch '716-todo-comments-in-framework-dolby' into 'main' 

resolving/removing TODO comments in SBA mode and split rend

See merge request !1012
parents 8e06e682 827058d7

lib_com/ivas_dirac_com.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ ivas_error ivas_dirac_config( 


        if ( hQMetaData != NULL )

        {

            if ( enc_dec == ENC || ( ivas_format != SBA_FORMAT && ivas_format != SBA_ISM_FORMAT ) ) /* Todo: This condition should probably be corrected in main */

            if ( enc_dec == ENC )

            {

                hConfig->nbands = hQMetaData->q_direction[0].cfg.nbands;

            }

lib_com/ivas_spar_com.c

+10 −12
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void ivas_reorder_array( float in_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][ 


static void ivas_get_Wscaling_factor( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float pred_coeffs_re[IVAS_SPAR_MAX_CH - 1][IVAS_MAX_NUM_BANDS], float ***mixer_mat, const int16_t start_band, const int16_t end_band, const int16_t dtx_vad, const int16_t num_ch, const int16_t *pNum_dmx, const int16_t bands_bw, const int16_t active_w, const int16_t active_w_vlbr, float *pWscale, const int16_t dyn_active_w_flag );



static void ivas_calc_post_pred_per_band( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t num_ch, const int16_t num_dmx, const int16_t band_idx, float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] );

static void ivas_calc_post_pred_per_band( float *pppCov_mat_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH], float ***mixer_mat, const int16_t num_ch, const int16_t band_idx, float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] );



static int16_t ivas_is_mat_inv( float in_re[MAX_MAT_DIM][MAX_MAT_DIM], const int16_t dim );
@@ -682,7 +682,7 @@ static void ivas_get_Wscaling_factor( 
{

    int16_t b, ch;

    float dm_f_local, abs_val;

    float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];

    float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] = { 0 };



    if ( dtx_vad == 0 )

    {
@@ -701,7 +701,10 @@ static void ivas_get_Wscaling_factor( 
        {

            float Gw_sq, g_sq = 0;



            ivas_calc_post_pred_per_band( cov_real, mixer_mat, num_ch, pNum_dmx[b * bands_bw], b, postpred_cov_re );

            if ( num_ch != pNum_dmx[b * bands_bw] )

            {

                ivas_calc_post_pred_per_band( cov_real, mixer_mat, num_ch, b, postpred_cov_re );

            }



            Gw_sq = cov_real[0][0][b] / max( postpred_cov_re[0][0], IVAS_FLT_EPS );
@@ -877,7 +880,6 @@ static void ivas_calc_post_pred_per_band( 
    float *cov_real[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH],

    float ***mixer_mat,

    const int16_t num_ch,

    const int16_t num_dmx,

    const int16_t band_idx,

    float postpred_cov_re[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH] )

{
@@ -886,9 +888,6 @@ static void ivas_calc_post_pred_per_band( 
    float temp_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH];

    float tmp_re;



    // NOTE: What is this doing?

    if ( num_dmx != num_ch )

    {

    for ( i = 0; i < num_ch; i++ )

    {

        for ( j = 0; j < num_ch; j++ )
@@ -896,7 +895,6 @@ static void ivas_calc_post_pred_per_band( 
            dmx_mat_conj[i][j] = mixer_mat[j][i][band_idx];

        }

    }

    }



    for ( i = 0; i < num_ch; i++ )

    {
@@ -1255,7 +1253,7 @@ void ivas_calc_c_p_coeffs( 


    if ( num_dmx != num_ch )

    {

        ivas_calc_post_pred_per_band( cov_real, mixer_mat, num_ch, num_dmx, band_idx, postpred_cov_re );

        ivas_calc_post_pred_per_band( cov_real, mixer_mat, num_ch, band_idx, postpred_cov_re );



        if ( num_dmx != 1 )

        {

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, st_ivas->sba_order );



    /* save old */

    if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL ) // ToDo; this never happens

    if ( st_ivas->hDirAC == NULL && st_ivas->hSpar != NULL )

    {

        st_ivas->hTcBuffer->num_slots = st_ivas->hSpar->num_slots;

        st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpar->nb_subframes;

lib_enc/ivas_dirac_enc.c

+0 −3
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ ivas_error ivas_dirac_enc_reconfigure( 
        return error;

    }





    /* :TODO: if the number of parameter bands change, do a meaningful mapping of parameter buffers from old to new band setting */



    if ( st_ivas->hQMetaData->useLowerRes )

    {

        hDirAC->block_grouping[0] = 0;

lib_rend/ivas_MSPred.c

+17 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int32_t quantPhase( 
    return phaseQ;

}





#ifdef SIMPLE_PHASE

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

 * Function rot_pm_pi()

 *
@@ -119,6 +119,21 @@ void rot_p_pi_2( 
    return;

}



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

 * Function rot_zero()

 *

 *

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



void rot_zero(

    float *pr,

    float *pi )

{

    *pr = *pr;

    *pi = *pi;



    return;

}



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

 * Function rot_m_pi_2()
@@ -138,7 +153,7 @@ void rot_m_pi_2( 


    return;

}



#endif



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

 * Function cplxmult()