Commit 169b659a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main-pc' into 1552_basop_sba_msan_fix

parents 28ce1f37 2498b3d5

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -97,9 +97,11 @@ 
#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 */

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

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */



#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*/

#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */



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

lib_dec/igf_scf_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ static void decode_sfe_vector_fx( 
            {

                /* (t == 0) && (f == 0) */

                /* decode one of the IGF_SYMBOLS_IN_TABLE == 27 alphabet symbols using the new raw AC function */

#ifdef FIX_969_USAN_IGF_ARITH

                /* NOTE: the float equivalent uses a tmp variable + explicit cast here to avoid undefined behaviour here. This BASOP version does not need it as it already uses signed Word16 return value here. */

#endif

                res = ari_decode_14bits_s27_ext_fx( st, &hPrivateData->acState, (const UWord16 *) hPrivateData->cf_se00 );



                pred = arith_decode_bits_fx( hPrivateData, st, 2 ); /* LSBs as 2 bit raw */

lib_dec/ivas_jbm_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -2104,6 +2104,7 @@ ivas_error ivas_jbm_dec_render_fx( 
        }

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

        {

#ifndef FIX_959_MASA_LINEAR_REND

            IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) )

            {

                *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -2118,6 +2119,9 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

            }

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )

#else

            IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )

#endif

            {

                ivas_dirac_dec_render_fx( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );

            }

lib_dec/ivas_output_config_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -453,7 +453,11 @@ void ivas_renderer_select( 
                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

                move16();

            }

#ifdef FIX_959_MASA_LINEAR_REND

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

#else

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

#endif

            move16();

        }

        ELSE IF( ( EQ_32( ivas_format, MASA_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) ||