Commit a7e9b9c4 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_949_MC_5MS_FRAMING

parent 17bbc1c7

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ 
#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Orange: Add support for reading binaural binary file */

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

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

#define NONBE_FIX_949_MC_5MS_FRAMING                          /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/

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

#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

lib_dec/ivas_jbm_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1279,12 +1279,10 @@ ivas_error ivas_jbm_dec_render( 
    }

    else if ( 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[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered];

        }

#endif

        if ( st_ivas->mc_mode == MC_MODE_MCT )

        {

            int16_t crendInPlaceRotation = FALSE;