Commit 5515153c authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1494_basop_mc_5ms_framing' into 'main-pc' 

BASOP porting: Issue 949: fix for 5ms framing/rendering in MC mode

See merge request !1436
parents fa286175 643c73c7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
#endif

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_949_MC_5MS_FRAMING                    /*Dlb: Issue 949: fix for 5ms framing/rendering in MC mode */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -2237,6 +2237,14 @@ ivas_error ivas_jbm_dec_render_fx( 
    }

    ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) )

    {



#ifdef NONBE_FIX_949_MC_5MS_FRAMING

        FOR( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )

        {

            p_tc_fx[n] = &st_ivas->hTcBuffer->tc_fx[n][st_ivas->hTcBuffer->n_samples_rendered];

        }

#endif



        IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCT ) )

        {

            Word16 crendInPlaceRotation = FALSE;