Commit af074ada authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1860_fix_ivas_init_dec_get_num_cldfb_instances_duplication
parents 9151a11e aafc25b7

lib_enc/ivas_mct_enc_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -619,6 +619,11 @@ ivas_error create_mct_enc_fx( 


#ifdef DEBUGGING

        hMCT->hBlockData[n]->hStereoMdct->mdct_stereo_mode_cmdl = SMDCT_MS_DECISION;

#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

        /*set all other members to defined states */

        hMCT->hBlockData[n]->hStereoMdct->fDualMono = 0;

        hMCT->hBlockData[n]->hStereoMdct->fMSstereo = 0;

#endif

#endif



        initMdctStereoEncData_fx( hMCT->hBlockData[n]->hStereoMdct, ivas_format, IVAS_CPE_MDCT, cp_bitrate, st_ivas->hEncoderConfig->max_bwidth, st_ivas->hCPE[0]->hCoreCoder[0]->igf, st_ivas->hCPE[0]->hCoreCoder[0]->igf ? st_ivas->hCPE[0]->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid : NULL, 1 );
@@ -800,6 +805,11 @@ ivas_error mct_enc_reconfigure_fx( 


#ifdef DEBUGGING

        hMCT->hBlockData[n]->hStereoMdct->mdct_stereo_mode_cmdl = SMDCT_MS_DECISION;

#ifdef DEBUG_FORCE_MDCT_STEREO_MODE

        /*set all other members to defined states */

        hMCT->hBlockData[n]->hStereoMdct->fDualMono = 0;

        hMCT->hBlockData[n]->hStereoMdct->fMSstereo = 0;

#endif

#endif



        initMdctStereoEncData_fx( hMCT->hBlockData[n]->hStereoMdct, ivas_format, IVAS_CPE_MDCT, cp_bitrate, st_ivas->hEncoderConfig->max_bwidth, st_ivas->hCPE[0]->hCoreCoder[0]->igf, st_ivas->hCPE[0]->hCoreCoder[0]->igf ? st_ivas->hCPE[0]->hCoreCoder[0]->hIGFEnc->igfData.igfInfo.grid : NULL, mem_init );