Commit 3c8a15b9 authored by jtorr's avatar jtorr
Browse files

Update lib_dec/ivas_stat_dec.h, lib_dec/ivas_init_dec.c,... 

Update lib_dec/ivas_stat_dec.h, lib_dec/ivas_init_dec.c, lib_dec/ivas_sba_dec.c, lib_dec/ivas_spar_md_dec.c, lib_enc/ivas_agc_enc.c, lib_enc/ivas_dirac_enc.c, lib_enc/ivas_lfe_enc.c, lib_enc/ivas_spar_encoder.c, lib_enc/ivas_spar_md_enc.c
parent 3efd7725

lib_dec/ivas_init_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ static ivas_error ivas_read_format( 
            int16_t tc_mode_offset;

            tc_mode_offset = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 );

            idx = st_ivas->bit_stream[tc_mode_offset];           

            // TODO: needs more work for HOA

            if ( st_ivas->sba_analysis_order == 0 )

            {

                st_ivas->sba_analysis_order = SBA_FOA_ORDER;

lib_dec/ivas_sba_dec.c

+2 −8
Original line number Diff line number Diff line
@@ -59,13 +59,7 @@ void ivas_sba_set_cna_cng_flag( 
{

    int16_t n, cpe_id;



    if ( st_ivas->sba_mode == SBA_MODE_SPAR && st_ivas->nchan_transport == 1 )

    {

        /* skip as done in init function */

        /* st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 0; */ /* Todo: Check if these can be enabled */

        /* st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 0; */

    }

    else if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) )

    if ( st_ivas->nchan_transport == 1 && ( ( st_ivas->renderer_type == RENDERER_DIRAC && st_ivas->hDirAC->synthesisConf == DIRAC_SYNTHESIS_GAIN_SHD ) || ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC ) ) )

    {

        st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1;

        st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1;
@@ -74,7 +68,7 @@ void ivas_sba_set_cna_cng_flag( 
    {

        for ( n = 0; n < CPE_CHANNELS; n++ )

        {

            st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; /* Todo: Check if these can be enabled */

            st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; 

            st_ivas->hCPE[0]->hCoreCoder[n]->cng_sba_flag = 1;

        }

    }

lib_dec/ivas_spar_md_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include "wmc_auto.h"

#include "ivas_stat_dec.h"



/*#define ENABLE_DITHER */ /* IVAS_fmToDo: development switch */



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

 * Local constants
@@ -584,7 +583,7 @@ static ivas_error ivas_spar_set_dec_config( 
        case 4: /* FOA_CHANNELS */

            hMdDec->num_decorr = IVAS_TD_DECORR_OUT_3CH;

            break;

        case 9: /* IVAS_HOA_2_CH */ // ToDo: is this relevant?

        case 9: /* IVAS_HOA_2_CH */ 

            hMdDec->num_decorr = IVAS_TD_DECORR_OUT_5CH;

            break;

        case 16: /* IVAS_HOA_3_CH */ // ToDo: is this relevant?

lib_dec/ivas_stat_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ typedef struct ivas_spar_md_dec_state_t 
    int16_t td_decorr_flag;

    int16_t spar_plc_enable_fadeout_flag;

    float ***mixer_mat;

    /*TODO : reuse hFbMixer->prior_mixer for this as that buffer is unused in decoder with FB_HARMONIZATION*/

    float mixer_mat_prev[MAX_PARAM_SPATIAL_SUBFRAMES + 1][IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH][IVAS_MAX_NUM_BANDS];

    ivas_spar_md_com_cfg spar_md_cfg;

    ivas_arith_coeffs_t arith_coeffs;

lib_enc/ivas_agc_enc.c

+2 −4
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ void ivas_agc_enc_process( 
    /* writing to a temporary bitstream file */

    if ( ivas_agc_writeBits( agcOut, n_channels, pState ) )

    {        

        /* TODO: return error once error codes are harmonized */

        IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "SPAR ENC AGC Failed to open agcOut\n " );

    }

#endif
@@ -477,7 +476,6 @@ static int16_t ivas_agc_writeBits( FILE *stream, const int16_t n_channels, ivas_ 
        if ( pState->gain_data[i].absGainExpCurr < 0 ||

             pState->gain_data[i].absGainExpCurr >= (int16_t) pow( 2, pState->agc_com.betaE ) )

        {            

            /* TODO: return error once error codes are harmonized */

            IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Error Gain values to write!!\n\n" );

        }