Commit cdc88657 authored by lefort's avatar lefort
Browse files

Merge branch 'float-pc' into 1522_ref_PortFlpMR1349

parents 33c2b8a8 3fd25001

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 
#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 */

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

#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */

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



#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1030,11 +1030,13 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );

            }

#ifndef FIX_957_REMOVE_PANNING_DEAD_CODE

            else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )

            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }

#endif

            else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

            {

                ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

lib_rend/ivas_reflections.c

+8 −0
Original line number Diff line number Diff line
@@ -59,9 +59,17 @@ static uint16_t LC_mixing_7_1[7] = { 0, 1, 2, 3, 4, 3, 4 }; 


static uint16_t LC_mixing_5_1_2[7] = { 0, 1, 2, 3, 4, 0, 1 };



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static uint16_t LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 3, 4 };

#else

static uint16_t LC_mixing_5_1_4[9] = { 0, 1, 2, 3, 4, 0, 1, 2, 3 };

#endif



#ifdef NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER

static uint16_t LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 3, 4 };

#else

static uint16_t LC_mixing_7_1_4[11] = { 0, 1, 2, 3, 4, 3, 4, 0, 1, 2, 3 };

#endif





/*-----------------------------------------------------------------------------------------*