Commit 0719ccff authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 118-bitrate-range-for-dtx-support

parents 0b3eb247 0121d010

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define CLEANUP_185_NO_AGC_EXCEPTION                    /* Issue 185: Cleanup AGC EXCEPTION code */

#endif

#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */

#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/

#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

lib_dec/ivas_stereo_switching_dec.c

+19 −3
Original line number Diff line number Diff line
@@ -1424,7 +1424,6 @@ void stereo_switching_dec( 


            sts[0]->tilt_code = 0.0f;

            sts[0]->gc_threshold = 0.0f;

            /*init_gp_clip( sts[1]->clip_var );*/



            set_f( sts[0]->mem_syn1, 0, M );

            set_f( sts[0]->mem_syn2, 0, M );
@@ -1454,7 +1453,6 @@ void stereo_switching_dec( 


        sts[1]->tilt_code = 0.0f;

        sts[1]->gc_threshold = 0.0f;

        /*init_gp_clip( sts[1]->clip_var );*/



        set_f( sts[1]->mem_syn1, 0, M );

        set_f( sts[1]->mem_syn2, 0, M );
@@ -1467,25 +1465,28 @@ void stereo_switching_dec( 
        mvr2r( sts[0]->old_exc, sts[1]->old_exc, L_EXC_MEM_DEC );

        mvr2r( sts[0]->lsf_old, sts[1]->lsf_old, M );

        mvr2r( sts[0]->lsp_old, sts[1]->lsp_old, M );



        if ( hCPE->element_mode == IVAS_CPE_MDCT )

        {

            sts[1]->last_core = sts[0]->last_core;

            sts[1]->last_coder_type = sts[0]->last_coder_type;

#ifndef FIX_221_BR_SWITCH_STEREO

            sts[1]->hTcxCfg->last_aldo = sts[0]->hTcxCfg->last_aldo;

            sts[1]->hTcxCfg->tcx_curr_overlap_mode = sts[0]->hTcxCfg->tcx_curr_overlap_mode;

#endif



            mvr2r( sts[0]->hHQ_core->old_out, sts[1]->hHQ_core->old_out, L_FRAME48k );

            mvr2r( sts[0]->delay_buf_out, sts[1]->delay_buf_out, HQ_DELTA_MAX * HQ_DELAY_COMP );

            mvr2r( sts[0]->hTcxDec->old_syn_Overl, sts[1]->hTcxDec->old_syn_Overl, 256 );

            /* Todo: apply panning to buffers instead of simply using dmx in left and right channel */



#ifndef FIX_221_BR_SWITCH_STEREO

            sts[1]->fscale = sts[0]->fscale;

            sts[1]->hTcxCfg->tcx_mdct_window_length = sts[0]->hTcxCfg->tcx_mdct_window_length;

            sts[1]->pit_res_max = sts[0]->pit_res_max;

            sts[1]->pit_res_max_past = sts[0]->pit_res_max_past;

            sts[1]->hTcxDec->L_frameTCX = sts[0]->hTcxDec->L_frameTCX;

            sts[1]->hTcxDec->conceal_eof_gain = sts[0]->hTcxDec->conceal_eof_gain;

#endif

        }

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )
@@ -1494,6 +1495,21 @@ void stereo_switching_dec( 
        set_f( sts[1]->old_exc, 0.0f, L_EXC_MEM_DEC );

    }



#ifdef FIX_221_BR_SWITCH_STEREO

    /* TD/DFT -> MDCT stereo switching (there is no TCX in the TD stereo secondary channel, or DFT stereo) */

    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->last_element_mode != IVAS_CPE_MDCT )

    {

        sts[1]->hTcxCfg->last_aldo = sts[0]->hTcxCfg->last_aldo;

        sts[1]->hTcxCfg->tcx_curr_overlap_mode = sts[0]->hTcxCfg->tcx_curr_overlap_mode;

        sts[1]->fscale = sts[0]->fscale;

        sts[1]->hTcxCfg->tcx_mdct_window_length = sts[0]->hTcxCfg->tcx_mdct_window_length;

        sts[1]->pit_res_max = sts[0]->pit_res_max;

        sts[1]->pit_res_max_past = sts[0]->pit_res_max_past;

        sts[1]->hTcxDec->L_frameTCX = sts[0]->hTcxDec->L_frameTCX;

        sts[1]->hTcxDec->conceal_eof_gain = sts[0]->hTcxDec->conceal_eof_gain;

    }

#endif



    return;

}

lib_enc/ivas_stereo_switching_enc.c

+12 −5
Original line number Diff line number Diff line
@@ -758,11 +758,8 @@ void stereo_switching_enc( 


        /* no secondary channel in the previous frame -> memory resets */

        set_zero( sts[1]->old_inp_12k8, L_INP_MEM );

        /*set_zero( sts[1]->old_inp_16k, L_INP_MEM );*/

        set_zero( sts[1]->mem_decim, 2 * L_FILT_MAX );

        /*set_zero( sts[1]->mem_decim16k, 2*L_FILT_MAX );*/

        sts[1]->mem_preemph = 0;

        /*sts[1]->mem_preemph16k = 0;*/



        set_zero( sts[1]->buf_speech_enc, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );

        set_zero( sts[1]->buf_speech_enc_pe, L_PAST_MAX_32k + L_FRAME32k + L_NEXT_MAX_32k );
@@ -803,7 +800,6 @@ void stereo_switching_enc( 
        mvr2r( sts[0]->lsp_old1, sts[1]->lsp_old1, M );



        sts[1]->GSC_noisy_speech = 0;



        if ( hCPE->element_mode == IVAS_CPE_MDCT )

        {

            /* cross-fade overlap region of DFT Stereo downmix and original stereo channels */
@@ -813,14 +809,16 @@ void stereo_switching_enc( 
                sts[1]->input[-sts[0]->encoderLookahead_FB + i] = ( ( sts[0]->encoderLookahead_FB - i ) * sts[0]->input[-sts[0]->encoderLookahead_FB + i] + i * sts[1]->input[-sts[0]->encoderLookahead_FB + i] ) * tmpF;

                sts[0]->input[-sts[0]->encoderLookahead_FB + i] = ( ( sts[0]->encoderLookahead_FB - i ) * sts[0]->input[-sts[0]->encoderLookahead_FB + i] + i * sts[1]->input[-2 * sts[0]->encoderLookahead_FB + i] ) * tmpF;

            }

            /* restore continous signal in right channel (part of old_output was used to store original left channel) */

            /* restore continuous signal in right channel (part of old_output was used to store original left channel) */

            mvr2r( sts[0]->input - sts[0]->hTcxEnc->L_frameTCX, sts[1]->input - sts[0]->hTcxEnc->L_frameTCX, sts[0]->hTcxEnc->L_frameTCX - sts[0]->encoderLookahead_FB );



            sts[1]->last_core = sts[0]->last_core;

            sts[1]->last_coder_type = sts[0]->last_coder_type;

            sts[1]->last_bwidth = sts[0]->last_bwidth;

#ifndef FIX_221_BR_SWITCH_STEREO

            sts[1]->hTcxCfg->last_aldo = sts[0]->hTcxCfg->last_aldo;

            sts[1]->hTcxCfg->tcx_curr_overlap_mode = sts[0]->hTcxCfg->tcx_curr_overlap_mode;

#endif

        }

    }

    else if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_MDCT )
@@ -829,5 +827,14 @@ void stereo_switching_enc( 
        set_f( sts[1]->hLPDmem->old_exc, 0.0f, L_EXC_MEM );

    }



#ifdef FIX_221_BR_SWITCH_STEREO

    /* TD/DFT -> MDCT stereo switching (there is no TCX in the TD stereo secondary channel, or DFT stereo) */

    if ( hCPE->element_mode == IVAS_CPE_MDCT && hCPE->last_element_mode != IVAS_CPE_MDCT )

    {

        sts[1]->hTcxCfg->last_aldo = sts[0]->hTcxCfg->last_aldo;

        sts[1]->hTcxCfg->tcx_curr_overlap_mode = sts[0]->hTcxCfg->tcx_curr_overlap_mode;

    }

#endif



    return;

}