Commit f655051f authored by vaclav's avatar vaclav
Browse files

Merge branch 'revision_of_todos' of... 

Merge branch 'revision_of_todos' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into revision_of_todos
parents 57c2b4c2 efb48b93

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_sampleRate,

        .match = "sample_rate",

        .matchShort = "fs",

        .description = "Input sampling rate in kHz (16, 32, 48) - required only with raw PCM inputs", /* TODO(sgi): Add sampling rate to scene description files */

        .description = "Input sampling rate in kHz (16, 32, 48) - required only with raw PCM inputs",

    },

    {

        .id = CmdLnOptionId_trajFile,

lib_com/core_com_config.c

+0 −1
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ void init_tcx_window_cfg( 
    hTcxCfg->tcx_mdct_window_min_length = (int16_t) ( sr_core * INV_CLDFB_BANDWIDTH );

    hTcxCfg->tcx_mdct_window_min_lengthFB = (int16_t) ( input_Fs * INV_CLDFB_BANDWIDTH );

    /* save complexity by copying the small windows if they have the same length */

    /* TODO: is this always the case ? */

    if ( hTcxCfg->tcx_mdct_window_min_length == hTcxCfg->tcx_mdct_window_trans_length )

    {

        mvr2r( hTcxCfg->tcx_mdct_window_trans, hTcxCfg->tcx_mdct_window_minimum, hTcxCfg->tcx_mdct_window_min_length );

lib_dec/dec_tcx.c

+1 −1
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ void decoder_tcx_imdct( 


        if ( st->element_mode > EVS_MONO )

        {

            st->old_fpitchFB = st->old_fpitch * (float) L_frameTCX_glob / (float) L_frame_glob; /* TODO - or maybe used min(L_frame_TCX,L_FRAME48k) ... */

            st->old_fpitchFB = st->old_fpitch * (float) L_frameTCX_glob / (float) L_frame_glob;

        }

        else

        {

lib_dec/ivas_dirac_decorr_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ ivas_error ivas_dirac_dec_decorr_open( 
        freq_domain_decorr_ap_params->max_frequency = ( DIRAC_MAX_DECORR_CLDFB_BANDS * 24000 ) / CLDFB_NO_CHANNELS_MAX;

    }



    freq_domain_decorr_ap_params->use_ducker = 1; /* ToDo: fcs: fixed for now but can be adaptive in an extended version */

    freq_domain_decorr_ap_params->use_ducker = 1; 



    assert( ( freq_domain_decorr_ap_params->max_frequency >= 0 ) && ( freq_domain_decorr_ap_params->max_frequency <= output_Fs / 2 ) && "Error: max_frequency invalid!" );

lib_dec/ivas_tcx_core_dec.c

+0 −24
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#include "stat_com.h"

#include "ivas_prot.h"



/*defne FIX_IVAS_337*/ // TODO: needs more work



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

 * Local prototypes

 *-------------------------------------------------------------*/
@@ -189,9 +187,6 @@ void stereo_tcx_core_dec( 


    /*Concealment*/

    int16_t bfi;

#ifdef FIX_IVAS_337 /*IVAS-337 consider BER */

    int16_t tcx_last_overlap_mode, tcx_current_overlap_mode;

#endif



    float psd[L_FRAME16k], psd_part[NPART_SHAPING];
@@ -267,28 +262,9 @@ void stereo_tcx_core_dec( 
    if ( !bfi )

    {

        st->second_last_core = st->last_core;

#ifdef FIX_IVAS_337 /*IVAS-337 consider BER */

        tcx_last_overlap_mode = st->hTcxCfg->tcx_last_overlap_mode;

        tcx_current_overlap_mode = st->hTcxCfg->tcx_curr_overlap_mode;

#endif



        dec_prm_tcx( st, param, param_lpc, &total_nbbits, last_element_mode, &bitsRead );



#ifdef FIX_IVAS_337 /*IVAS-337 consider BER */

        if ( !st->rate_switching_init && st->BER_detect )

        {

            st->coder_type = st->last_coder_type;

            st->last_core = st->second_last_core;

            st->hTcxCfg->tcx_last_overlap_mode = tcx_last_overlap_mode;

            st->hTcxCfg->tcx_curr_overlap_mode = tcx_current_overlap_mode;

            st->bfi = 1;

            bfi = 1;

            st->flagGuidedAcelp = 0;

            st->nbLostCmpt++;

            st->core_brate = st->last_core_brate;

            st->core = GetPLCModeDecision( st );

        }

#endif

    }

    else

    {