Commit 7a0c4e2b authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept NONBE_FIX_949_MC_5MS_FRAMING

parent 4231c17b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
#define FIX_1372_ISAR_POST_REND

#endif

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

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

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

lib_dec/ivas_jbm_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -2255,12 +2255,10 @@ 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 ) )

        {